decouple java docker from android docker (#37470)

Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Feb 11, 2025 · 6e759ae · 6e759ae
1 parent c0f11e7
commit 6e759ae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-112 : [Telink] Update Docker image (Zephyr SDK update)
+113 : [Android] set java 8 for java docker
diff --git a/integrations/docker/images/stage-2/chip-build-java/Dockerfile b/integrations/docker/images/stage-2/chip-build-java/Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
-    openjdk-11-jdk \
+    openjdk-8-jdk \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line
 
@@ -20,4 +20,4 @@ RUN set -x \
     && : # last line
 
 ENV PATH $PATH:/usr/lib/kotlinc/bin
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
diff --git a/integrations/docker/images/stage-3/chip-build-android/Dockerfile b/integrations/docker/images/stage-3/chip-build-android/Dockerfile
@@ -2,9 +2,6 @@ ARG VERSION=1
 FROM ghcr.io/project-chip/chip-build-java:${VERSION}
 LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
 
-# JDK 8 access
-# JDK 8 is required because Android `sdkmanager`
-# doesn't work with JDK 11.
 RUN set -x \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
@@ -72,3 +69,4 @@ RUN set -x \
 
 ENV ANDROID_HOME=/opt/android/sdk
 ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
+ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		112 : [Telink] Update Docker image (Zephyr SDK update)
		113 : [Android] set java 8 for java docker