Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Java][docker] set java 8 for java docker #37470

Merged
merged 2 commits into from
Feb 11, 2025
Merged

[Java][docker] set java 8 for java docker #37470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26cfeec
decouple java docker from android docker
yunhanw-google Feb 7, 2025
685c2fd
Merge branch 'master' into feature/decouple_java_docker
andy31415 Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions integrations/docker/images/stage-2/chip-build-java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
4 changes: 1 addition & 3 deletions integrations/docker/images/stage-3/chip-build-android/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Loading