Skip to content

Commit cf68487

Browse files
Update java in vscode and java image docker images
This defines docker image 108
1 parent 11e2592 commit cf68487

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
107 : Tizen - fix rpm unpacking for stage-3 build
1+
108 : Update vscode docker with java17 and fix java_home in java docker

integrations/docker/images/stage-2/chip-build-java/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ RUN set -x \
1313
# Download and install kotlin compiler
1414
RUN set -x \
1515
&& cd /usr/lib \
16-
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \
16+
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v2.1.10/kotlin-compiler-2.1.10.zip \
1717
&& unzip kotlin-compiler-*.zip \
1818
&& rm kotlin-compiler-*.zip \
1919
&& rm -f kotlinc/bin/*.bat \
2020
&& : # last line
2121

2222
ENV PATH $PATH:/usr/lib/kotlinc/bin
23-
ENV JAVA_PATH=/usr/lib/jvm/java-17-openjdk-amd64
23+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ RUN set -x \
9191
# - telnet
9292
# - srecord
9393
# For java builds:
94-
# - openjdk-8-jdk
94+
# - openjdk-17-jdk
9595
RUN set -x \
9696
&& apt-get update \
9797
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
@@ -119,7 +119,7 @@ ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
119119
ENV IDF_PATH=/opt/espressif/esp-idf/
120120
ENV IDF_TOOLS_PATH=/opt/espressif/tools
121121
ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/6.1-langdale
122-
ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
122+
ENV JAVA_PATH=/usr/lib/jvm/java-17-openjdk-amd64
123123
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
124124
ENV OPENOCD_PATH=/opt/openocd/
125125
ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa

0 commit comments

Comments
 (0)