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

Install openjdk8 in chip-build-java #29795

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Install openjdk8 in chip-build-java #29795

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
70606f1
Install openjdk8 in chip-build-java
andy31415 Oct 16, 2023
32493b2
Make sure vscode also has java installed
andy31415 Oct 16, 2023
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 @@
20 : [Chip-build] Decrease some image sizes
21 : [chip-build-java] Ensure java is actually available in the docker image
8 changes: 8 additions & 0 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 @@ -2,6 +2,14 @@ ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION}
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 \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line

# Download and install kotlin compiler
RUN set -x \
&& cd /usr/lib \
Expand Down
18 changes: 9 additions & 9 deletions integrations/docker/images/vscode/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,22 @@ RUN set -x \
&& chmod -R a+w /opt/android/sdk/licenses \
&& : # last line

# Required for the Tizen SDK
# Required for the Tizen SDK:
# - zip
# Required for the Open IoT SDK platform
# - expect
# - telnet
# - srecord
# For java builds:
# - openjdk-8-jdk
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
zip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& : # last line

# Required for the Open IoT SDK platform
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
expect \
telnet \
srecord \
openjdk-8-jdk \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
Loading