From 5ac255f4dc5ffae7aca217fcedb5eb90cfd77366 Mon Sep 17 00:00:00 2001 From: Bogdan Mukvich Date: Mon, 24 Apr 2023 10:52:33 +0200 Subject: [PATCH] Add JDK 11 to kotlin build env --- scripts/kotlin-build-env.dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/kotlin-build-env.dockerfile b/scripts/kotlin-build-env.dockerfile index b9548c19ee0..e269c299122 100644 --- a/scripts/kotlin-build-env.dockerfile +++ b/scripts/kotlin-build-env.dockerfile @@ -24,11 +24,14 @@ RUN curl https://corretto.aws/downloads/resources/8.322.06.2/amazon-corretto-8.3 RUN curl https://cdn.azul.com/zulu/bin/zulu9.0.7.1-ca-jdk9.0.7-linux_x64.tar.gz | tar -xz -C /usr/lib/jvm +RUN curl https://corretto.aws/downloads/resources/11.0.19.7.1/amazon-corretto-11.0.19.7.1-linux-x64.tar.gz | tar -xz -C /usr/lib/jvm + # New naming conventions ENV JDK6=/usr/lib/jvm/zulu6.22.0.3-jdk6.0.119-linux_x64 \ JDK7=/usr/lib/jvm/zulu7.40.0.15-ca-jdk7.0.272-linux_x64 \ JDK8=/usr/lib/jvm/amazon-corretto-8.322.06.2-linux-x64 \ - JDK9=/usr/lib/jvm/zulu9.0.7.1-jdk9.0.7-linux_x64 + JDK9=/usr/lib/jvm/zulu9.0.7.1-jdk9.0.7-linux_x64 \ + JDK11=/usr/lib/jvm/amazon-corretto-11.0.19.7.1-linux-x64 # TeamCity JDK old naming conventions. Kotlin build still have dependencies in Maven build. ENV JDK_18=$JDK8 @@ -38,8 +41,10 @@ ENV JDK_16_x64=$JDK6 \ JDK_18_x64=$JDK8 \ JDK_9_x64=$JDK9 -ENV JAVA_HOME=$JDK8 \ - PATH="$PATH:$JDK8/bin" +ENV JDK_11_0=$JDK11 + +ENV JAVA_HOME=$JDK_11_0 \ + PATH="$PATH:$JAVA_HOME/bin" RUN curl "https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz" | tar -xz -C /usr/lib