From fe2bb94774e2cdf81a4069b87c75c4539ccd0030 Mon Sep 17 00:00:00 2001 From: "Brian A. Ignacio" Date: Thu, 30 May 2024 16:20:14 +0800 Subject: [PATCH] rm mount from devcontainer json template (#1200) * rm mount from devcontainer json template * update userid * update pythonbinpath in container --- templates/.devcontainer/Dockerfile | 2 +- templates/.devcontainer/devcontainer.json | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/templates/.devcontainer/Dockerfile b/templates/.devcontainer/Dockerfile index 1fe78dcce..8d7b92d61 100644 --- a/templates/.devcontainer/Dockerfile +++ b/templates/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM espressif/idf ARG DEBIAN_FRONTEND=nointeractive ARG CONTAINER_USER=esp -ARG USER_UID=1000 +ARG USER_UID=1050 ARG USER_GID=$USER_UID RUN apt-get update \ diff --git a/templates/.devcontainer/devcontainer.json b/templates/.devcontainer/devcontainer.json index 1d913ec4a..d2539618b 100644 --- a/templates/.devcontainer/devcontainer.json +++ b/templates/.devcontainer/devcontainer.json @@ -5,21 +5,13 @@ "build": { "dockerfile": "Dockerfile" }, - // Add the IDs of extensions you want installed when the container is created - "workspaceMount": "source=${localWorkspaceFolder},target=${localWorkspaceFolder},type=bind", - /* the path of workspace folder to be opened after container is running - */ - "workspaceFolder": "${localWorkspaceFolder}", - "mounts": [ - "source=extensionCache,target=/root/.vscode-server/extensions,type=volume" - ], "customizations": { "vscode": { "settings": { "terminal.integrated.defaultProfile.linux": "bash", "idf.espIdfPath": "/opt/esp/idf", "idf.customExtraPaths": "", - "idf.pythonBinPath": "/opt/esp/python_env/idf5.3_py3.10_env/bin/python", + "idf.pythonBinPath": "/opt/esp/python_env/idf5.4_py3.12_env/bin/python", "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git" }, @@ -32,7 +24,7 @@ "terminal.integrated.defaultProfile.linux": "bash", "idf.espIdfPath": "/opt/esp/idf", "idf.customExtraPaths": "", - "idf.pythonBinPath": "/opt/esp/python_env/idf5.3_py3.10_env/bin/python", + "idf.pythonBinPath": "/opt/esp/python_env/idf5.4_py3.12_env/bin/python", "idf.toolsPath": "/opt/esp", "idf.gitPath": "/usr/bin/git" },