From 76c36ab1d4a727345991136c523a52643fca64b2 Mon Sep 17 00:00:00 2001
From: Andrei Litvin <andy314@gmail.com>
Date: Fri, 27 Oct 2023 18:53:35 -0400
Subject: [PATCH] Make the vscode devcontainer load again (#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
---
 .devcontainer/Dockerfile        | 13 ++++++-------
 .devcontainer/devcontainer.json |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index ff773c6f51e05d..4c8a11fd42f7f1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -55,14 +55,13 @@ RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/resty
 RUN mkdir -p /opt/sdk/sdks/ \
     && chown -R $USERNAME:$USERNAME \
     /opt/sdk/sdks/ `# NXP uses a patch_sdk script to change SDK files` \
-    /opt/espressif/esp-idf `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
-    /opt/espressif/tools \
     /opt/NordicSemiconductor/nrfconnect/ `# $USERNAME needs to own west configuration to build nRF Connect examples` \
-    /opt/ubuntu-21.04-aarch64-sysroot/usr/ `# allow read/write access to header and libraries` \
-    /opt/android/sdk `# allow licenses to be accepted` \
-    /opt/ameba/ambd_sdk_with_chip_non_NDA/ `# AmebaD requires access to change build_info.h` \
-    /opt/fsl-imx-xwayland/5.15-kirkstone/ \
-    /opt/openocd \
+    $IDF_PATH `# $USERNAME needs to own the esp-idf and tools for the examples to build` \
+    $IDF_TOOLS_PATH \
+    $SYSROOT_AARCH64 `# allow read/write access to header and libraries` \
+    $ANDROID_HOME `# allow licenses to be accepted` \
+    $AMEBA_PATH `# AmebaD requires access to change build_info.h` \
+    $IMX_SDK_ROOT \
     && :
 
 # Fix Tizen SDK paths for new user
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f33e83f87b17fa..94ad9314b9a56c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,7 +14,7 @@
     "mounts": [
         "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
     ],
-    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
+    "initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 22",
     "image": "matter-dev-environment:local",
     "remoteUser": "vscode",
     "customizations": {