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

Update Dockerfile for updating java version (Java 8 -> Java 11) #37130

Merged
merged 3 commits into from
Jan 21, 2025
Merged

Update Dockerfile for updating java version (Java 8 -> Java 11) #37130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
251f341
Update Dockerfile for updating java version
joonhaengHeo Jan 21, 2025
9c06dec
Update version file
joonhaengHeo Jan 21, 2025
a8317b5
Merge branch 'master' into update_java_build_docker
joonhaengHeo Jan 21, 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
6 changes: 3 additions & 3 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
@@ -1,12 +1,12 @@
ARG VERSION=1
ARG VERSION=2
FROM ghcr.io/project-chip/chip-build:${VERSION}
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

# Ensure some java is installed
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
openjdk-8-jdk \
openjdk-11-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_PATH=/usr/lib/jvm/java-8-openjdk-amd64
ENV JAVA_PATH=/usr/lib/jvm/java-11-openjdk-amd64
4 changes: 2 additions & 2 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
@@ -1,4 +1,4 @@
ARG VERSION=1
ARG VERSION=2
FROM ghcr.io/project-chip/chip-build-java:${VERSION}
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip

Expand All @@ -8,7 +8,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-8-jdk \
openjdk-11-jdk \
rsync \
swig \
&& rm -rf /var/lib/apt/lists/ \
Expand Down
Loading