Merge branch 'master' into tizen-arm64-dockerfile

XToripuru · web-flow · commit 3768fe357e98 · 2025-02-27T13:50:54.000+01:00
diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version
@@ -1 +1 @@
-119 : [Tizen] Add arm64 target - Docker part
+120 : [Tizen] Add arm64 target - Docker part
diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile
@@ -99,7 +99,7 @@ RUN set -x \
     expect \
     telnet \
     srecord \
-    openjdk-8-jdk \
+    openjdk-11-jdk \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/ \
     && : # last line

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-119 : [Tizen] Add arm64 target - Docker part`
	`1`	`+120 : [Tizen] Add arm64 target - Docker part`