Skip to content

Commit

Permalink
update java in vscode
Browse files Browse the repository at this point in the history
  • Loading branch information
yunhanw-google committed Feb 5, 2025
1 parent f7226c1 commit 3ca5faa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 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 @@
107 : Tizen - fix rpm unpacking for stage-3 build
108 : Update vscode docker with java17 and fix java_home in java docker
4 changes: 2 additions & 2 deletions integrations/docker/images/stage-2/chip-build-java/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ RUN set -x \
# Download and install kotlin compiler
RUN set -x \
&& cd /usr/lib \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v2.1.10/kotlin-compiler-2.1.10.zip \
&& unzip kotlin-compiler-*.zip \
&& rm kotlin-compiler-*.zip \
&& rm -f kotlinc/bin/*.bat \
&& : # last line

ENV PATH $PATH:/usr/lib/kotlinc/bin
ENV JAVA_PATH=/usr/lib/jvm/java-17-openjdk-amd64
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ RUN set -x \
# - telnet
# - srecord
# For java builds:
# - openjdk-8-jdk
# - openjdk-17-jdk
RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
Expand Down Expand Up @@ -119,7 +119,7 @@ ENV WIFI_SDK_ROOT=/opt/silabs/wifi_sdk
ENV IDF_PATH=/opt/espressif/esp-idf/
ENV IDF_TOOLS_PATH=/opt/espressif/tools
ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/6.1-langdale
ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
ENV JAVA_PATH=/usr/lib/jvm/java-17-openjdk-amd64
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
ENV OPENOCD_PATH=/opt/openocd/
ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
Expand Down

0 comments on commit 3ca5faa

Please sign in to comment.