From 43f2d9fb74e0fa25ec256d8ef5814f45b1be5860 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Mon, 26 Jul 2021 11:50:11 +0900 Subject: [PATCH] Update chip-build-vscode image to import Tizen platform requirement Signed-off-by: hyunuk.tak Signed-off-by: hyunuktak --- integrations/docker/images/chip-build-vscode/Dockerfile | 4 ++++ integrations/docker/images/chip-build/version | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/integrations/docker/images/chip-build-vscode/Dockerfile b/integrations/docker/images/chip-build-vscode/Dockerfile index 234097af600bdf..729dade606a5d7 100644 --- a/integrations/docker/images/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/chip-build-vscode/Dockerfile @@ -4,6 +4,7 @@ FROM connectedhomeip/chip-build-efr32:${VERSION} AS efr32 FROM connectedhomeip/chip-build-android:${VERSION} AS android FROM connectedhomeip/chip-build-esp32-qemu:${VERSION} as esp32 FROM connectedhomeip/chip-build-mbed-os:${VERSION} AS mbedos +FROM connectedhomeip/chip-build-tizen:${VERSION} AS tizen FROM connectedhomeip/chip-build:${VERSION} # qemu-src copied over because qemu directory contains symlinks to the src @@ -23,6 +24,8 @@ COPY --from=mbedos /opt/mbed-os /opt/mbed-os COPY --from=mbedos /opt/mbed-os-toolchain/ /opt/mbed-os-toolchain/ COPY --from=mbedos /opt/openocd/ /opt/openocd/ +COPY --from=tizen /opt/tizen_sdk /opt/tizen_sdk + # Android license file "acceping" is done by writing license hashes # into the 'licenses' subfolder. This allows any user (in particular # 'vscode' to accept licenses) @@ -45,3 +48,4 @@ ENV MBED_GCC_ARM_PATH=/opt/mbed-os-toolchain/gcc-arm-none-eabi-9-2019-q4-major/b ENV MBED_OS_PATH=/opt/mbed-os/ ENV OPENOCD_PATH=/opt/openocd/ ENV PW_ENVIRONMENT_ROOT=/home/vscode/pigweed/env +ENV TIZEN_HOME /opt/tizen_sdk diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 93842d6cdace08..ebfd7000189908 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.4.34 +0.4.35