Skip to content

Commit 6076317

Browse files
authored
Make the vscode devcontainer load again (project-chip#30076)
* Update dockerfile to version 21 (to get java) and use env variables for paths to make them resilient to change * Version 22 is actually the latest * OpenOCD does not seem to exist in the vscode image currently
1 parent f53f4eb commit 6076317

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.devcontainer/Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
5555
RUN mkdir -p /opt/sdk/sdks/ \
5656
&& chown -R $USERNAME:$USERNAME \
5757
/opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
58-
/opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
59-
/opt/espressif/tools \
6058
/opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
61-
/opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
62-
/opt/android/sdk `# allow licenses to be accepted` \
63-
/opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
64-
/opt/fsl-imx-xwayland/5.15-kirkstone/ \
65-
/opt/openocd \
59+
$IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
60+
$IDF_TOOLS_PATH \
61+
$SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
62+
$ANDROID_HOME `# allow licenses to be accepted` \
63+
$AMEBA_PATH `# AmebaD requires access to change build_info.h` \
64+
$IMX_SDK_ROOT \
6665
&& :
6766

6867
# Fix Tizen SDK paths for new user

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
17+
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

0 commit comments

Comments
 (0)