Skip to content

Commit

Permalink
Install openjdk8 in chip-build-java (#29795)
Browse files Browse the repository at this point in the history
* Install openjdk8 in chip-build-java

* Make sure vscode also has java installed
  • Loading branch information
andy31415 authored and pull[bot] committed Oct 20, 2023
1 parent f02ac26 commit 1202467
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
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
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
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

0 comments on commit 1202467

Please sign in to comment.