File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
integrations/docker/images
stage-3/chip-build-android Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 1- 159 : Update docker image container with Zephyr for Silabs
1+ 160 : Bump Java version with 17
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh
55RUN set -x \
66 && apt-get update \
77 && DEBIAN_FRONTEND=noninteractive apt-get install -fy \
8- openjdk-11 -jdk \
8+ openjdk-17 -jdk \
99 rsync \
1010 swig \
1111 && rm -rf /var/lib/apt/lists/ \
@@ -69,4 +69,4 @@ RUN set -x \
6969
7070ENV ANDROID_HOME=/opt/android/sdk
7171ENV ANDROID_NDK_HOME=/opt/android/android-ndk-r28c
72- ENV JAVA_HOME=/usr/lib/jvm/java-11 -openjdk-amd64
72+ ENV JAVA_HOME=/usr/lib/jvm/java-17 -openjdk-amd64
Original file line number Diff line number Diff line change @@ -91,15 +91,15 @@ RUN set -x \
9191# - telnet
9292# - srecord
9393# For java builds:
94- # - openjdk-11 -jdk
94+ # - openjdk-17 -jdk
9595RUN set -x \
9696 && apt-get update \
9797 && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
9898 zip \
9999 expect \
100100 telnet \
101101 srecord \
102- openjdk-11 -jdk \
102+ openjdk-17 -jdk \
103103 && apt-get clean \
104104 && rm -rf /var/lib/apt/lists/ \
105105 && : # last line
@@ -119,7 +119,7 @@ ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
119119ENV IDF_PATH=/opt/espressif/esp-idf/
120120ENV IDF_TOOLS_PATH=/opt/espressif/tools
121121ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/6.1-langdale
122- ENV JAVA_HOME=/usr/lib/jvm/java-11 -openjdk-amd64
122+ ENV JAVA_HOME=/usr/lib/jvm/java-17 -openjdk-amd64
123123ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
124124ENV OPENOCD_PATH=/opt/openocd/
125125ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
You can’t perform that action at this time.
0 commit comments