Skip to content

Commit ae0a2c1

Browse files
decouple java docker from android docker
1 parent 8deebeb commit ae0a2c1

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
111 : [Android] Update android sdk and java version
1+
112 : [Android] set java 9 for java docker

integrations/docker/images/stage-2/chip-build-java/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
66
RUN set -x \
77
&& apt-get update \
88
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
9-
openjdk-11-jdk \
9+
openjdk-8-jdk \
1010
&& rm -rf /var/lib/apt/lists/ \
1111
&& : # last line
1212

@@ -20,4 +20,4 @@ RUN set -x \
2020
&& : # last line
2121

2222
ENV PATH $PATH:/usr/lib/kotlinc/bin
23-
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
23+
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

integrations/docker/images/stage-3/chip-build-android/Dockerfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ ARG VERSION=1
22
FROM ghcr.io/project-chip/chip-build-java:${VERSION}
33
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
44

5-
# JDK 8 access
6-
# JDK 8 is required because Android `sdkmanager`
7-
# doesn't work with JDK 11.
85
RUN set -x \
96
&& apt-get update \
107
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
@@ -72,3 +69,4 @@ RUN set -x \
7269

7370
ENV ANDROID_HOME=/opt/android/sdk
7471
ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r23c
72+
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64

0 commit comments

Comments
 (0)