File tree 3 files changed +5
-5
lines changed
integrations/docker/images
3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 1
- 107 : Tizen - fix rpm unpacking for stage-3 build
1
+ 108 : Update vscode docker with java17 and fix java_home in java docker
Original file line number Diff line number Diff line change @@ -13,11 +13,11 @@ RUN set -x \
13
13
# Download and install kotlin compiler
14
14
RUN set -x \
15
15
&& 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 \
17
17
&& unzip kotlin-compiler-*.zip \
18
18
&& rm kotlin-compiler-*.zip \
19
19
&& rm -f kotlinc/bin/*.bat \
20
20
&& : # last line
21
21
22
22
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
Original file line number Diff line number Diff line change @@ -91,7 +91,7 @@ RUN set -x \
91
91
# - telnet
92
92
# - srecord
93
93
# For java builds:
94
- # - openjdk-8 -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 \
@@ -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_PATH=/usr/lib/jvm/java-8 -openjdk-amd64
122
+ ENV JAVA_PATH=/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