Add JAVA_PATH to our dockerfile environment variables (#26851)

Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Jan 8, 2024 · 95f093e · 95f093e
1 parent 1d404a4
commit 95f093e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/integrations/docker/images/chip-build-java/Dockerfile b/integrations/docker/images/chip-build-java/Dockerfile
@@ -11,3 +11,4 @@ RUN set -x \
     && : # last line
 
 ENV PATH $PATH:/usr/lib/kotlinc/bin
+ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile
@@ -98,6 +98,7 @@ ENV SILABS_BOARD=BRD4161A
 ENV IDF_PATH=/opt/espressif/esp-idf/
 ENV IDF_TOOLS_PATH=/opt/espressif/tools
 ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/5.15-kirkstone/
+ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
 ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
 ENV NXP_K32W0_SDK_ROOT=/opt/k32w_sdk
 ENV OPENOCD_PATH=/opt/openocd/

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.7.14 Version bump reason: [Telink] Update Docker image (drivers update)
+0.7.15 Version bump reason: [Java] Set JAVA_PATH in chip-build-java and vscode
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ RUN set -x \
		&& : # last line

		ENV PATH $PATH:/usr/lib/kotlinc/bin
		ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.7.14 Version bump reason: [Telink] Update Docker image (drivers update)
		0.7.15 Version bump reason: [Java] Set JAVA_PATH in chip-build-java and vscode