This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-ci-docker.git
commit 4512ab97f7142fce496360296269f4625788317d Author: Chesnay Schepler <[email protected]> AuthorDate: Thu Jun 8 13:58:03 2023 +0200 Use Temurin JDK11 --- base/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 7a9b041..5f2056f 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -12,10 +12,9 @@ RUN set -eux; \ apt-get update; \ apt-get install -y git -# Install Adopt JDK11 -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - ; \ - add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ ; \ - apt-get update ; apt-get install -y adoptopenjdk-11-hotspot +# Install Temurin JDK11 +RUN wget -q https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz +RUN tar -C /usr/lib/jvm -xzf OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz # Install Temurin JDK17 RUN wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz @@ -25,7 +24,7 @@ RUN tar -C /usr/lib/jvm -xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz # use java8 by default, but provide java11 as well RUN echo "PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH" >> /etc/environment RUN echo "JAVA_HOME_8_X64=/usr/lib/jvm/java-8-openjdk-amd64" >> /etc/environment -RUN echo "JAVA_HOME_11_X64=/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64" >> /etc/environment +RUN echo "JAVA_HOME_11_X64=/usr/lib/jvm/jdk-11.0.19+7" >> /etc/environment RUN echo "JAVA_HOME_17_X64=/usr/lib/jvm/jdk-17.0.1+12" >> /etc/environment RUN echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> /etc/environment RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java @@ -35,7 +34,7 @@ RUN update-alternatives --set jstack /usr/lib/jvm/java-8-openjdk-amd64/bin/jstac RUN update-alternatives --set javadoc /usr/lib/jvm/java-8-openjdk-amd64/bin/javadoc ENV JAVA_HOME_8_X64 "/usr/lib/jvm/java-8-openjdk-amd64" -ENV JAVA_HOME_11_X64 "/usr/lib/jvm/adoptopenjdk-11-hotspot-amd64" +ENV JAVA_HOME_11_X64 "/usr/lib/jvm/jdk-11.0.19+7" ENV JAVA_HOME_17_X64 "/usr/lib/jvm/jdk-17.0.1+12" ENV JAVA_HOME "/usr/lib/jvm/java-8-openjdk-amd64"
