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
5
5
RUN set -x \
6
6
&& apt-get update \
7
7
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy \
8
- openjdk-11 -jdk \
8
+ openjdk-17 -jdk \
9
9
rsync \
10
10
swig \
11
11
&& rm -rf /var/lib/apt/lists/ \
@@ -69,4 +69,4 @@ RUN set -x \
69
69
70
70
ENV ANDROID_HOME=/opt/android/sdk
71
71
ENV 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 \
91
91
# - telnet
92
92
# - srecord
93
93
# For java builds:
94
- # - openjdk-11 -jdk
94
+ # - openjdk-17 -jdk
95
95
RUN set -x \
96
96
&& apt-get update \
97
97
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
98
98
zip \
99
99
expect \
100
100
telnet \
101
101
srecord \
102
- openjdk-11 -jdk \
102
+ openjdk-17 -jdk \
103
103
&& apt-get clean \
104
104
&& rm -rf /var/lib/apt/lists/ \
105
105
&& : # last line
@@ -119,7 +119,7 @@ ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
119
119
ENV IDF_PATH=/opt/espressif/esp-idf/
120
120
ENV IDF_TOOLS_PATH=/opt/espressif/tools
121
121
ENV 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
123
123
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
124
124
ENV OPENOCD_PATH=/opt/openocd/
125
125
ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
You can’t perform that action at this time.
0 commit comments