QD-10349 Add jdk 17 to android image (not only internal) for 2024.3

JetBrains · Dec 2, 2024 · d5c5e54 · d5c5e54
1 parent 7592b9c
commit d5c5e54
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/2024.3/android-community/Dockerfile b/2024.3/android-community/Dockerfile
@@ -76,9 +76,10 @@ RUN set -ex && \
 
 ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
 ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
-ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK="$QODANA_DATA/.jdks/corretto-11"
-# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
-COPY --from=amazoncorretto:11.0.24 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK
+ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK_11="/root/.jdks/corretto-11" QODANA_CORETTO_SDK_17="/root/.jdks/corretto-17"
+# IDE includes JDK21 by default since 2024, so we need additional JDK for the most projects
+COPY --from=amazoncorretto:11.0.25 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK_11
+COPY --from=amazoncorretto:17.0.13 /usr/lib/jvm/java-17-amazon-corretto $QODANA_CORETTO_SDK_17
 
 ARG ANDROID_SDK_VERSION="9123335"
 ARG ANDROID_SDK_SHA256="0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a"

diff --git a/2024.3/android-community/internal.Dockerfile b/2024.3/android-community/internal.Dockerfile
@@ -14,7 +14,7 @@ RUN chmod +x $QODANA_DIST/bin/*.sh $QODANA_DIST/bin/qodana && \
 ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
 ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
 ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK_11="/root/.jdks/corretto-11" QODANA_CORETTO_SDK_17="/root/.jdks/corretto-17"
-# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
+# IDE includes JDK21 by default since 2024, so we need additional JDK for the most projects
 COPY --from=amazoncorretto:11.0.25 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK_11
 COPY --from=amazoncorretto:17.0.13 /usr/lib/jvm/java-17-amazon-corretto $QODANA_CORETTO_SDK_17
 

diff --git a/2024.3/android/Dockerfile b/2024.3/android/Dockerfile
@@ -76,9 +76,10 @@ RUN set -ex && \
 
 ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
 ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
-ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK="$QODANA_DATA/.jdks/corretto-11"
-# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
-COPY --from=amazoncorretto:11.0.24 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK
+ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK_11="/root/.jdks/corretto-11" QODANA_CORETTO_SDK_17="/root/.jdks/corretto-17"
+# IDE includes JDK21 by default since 2024, so we need additional JDK for the most projects
+COPY --from=amazoncorretto:11.0.25 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK_11
+COPY --from=amazoncorretto:17.0.13 /usr/lib/jvm/java-17-amazon-corretto $QODANA_CORETTO_SDK_17
 
 ARG ANDROID_SDK_VERSION="9123335"
 ARG ANDROID_SDK_SHA256="0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a"

diff --git a/2024.3/android/internal.Dockerfile b/2024.3/android/internal.Dockerfile
@@ -14,7 +14,7 @@ RUN chmod +x $QODANA_DIST/bin/*.sh $QODANA_DIST/bin/qodana && \
 ENV ANDROID_SDK_ROOT="/opt/android-sdk" ANDROID_USER_HOME="$QODANA_DATA/cache/android"
 ENV ANDROID_HOME="$ANDROID_SDK_ROOT"
 ENV ANDROID_SDK_TOOLS="$ANDROID_SDK_ROOT/cmdline-tools/tools/bin" QODANA_CORETTO_SDK_11="/root/.jdks/corretto-11" QODANA_CORETTO_SDK_17="/root/.jdks/corretto-17"
-# IDE includes JDK17 by default since 2022, so we need additional JDK for the most projects
+# IDE includes JDK21 by default since 2024, so we need additional JDK for the most projects
 COPY --from=amazoncorretto:11.0.25 /usr/lib/jvm/java-11-amazon-corretto $QODANA_CORETTO_SDK_11
 COPY --from=amazoncorretto:17.0.13 /usr/lib/jvm/java-17-amazon-corretto $QODANA_CORETTO_SDK_17