From da362517d5b72ab3507a34e57c974dc85374c9c4 Mon Sep 17 00:00:00 2001 From: kevin_mack_msft Date: Mon, 31 Mar 2025 10:37:48 -0400 Subject: [PATCH 1/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e7b8817..cc83cfb 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,20 +4,24 @@ "name": "devcontainer", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "image": "mcr.microsoft.com/devcontainers/base:bullseye", + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + }, + "extensions": [ + "ms-azuretools.vscode-docker", + "ms-vscode-remote.remote-containers" + ], + "mounts": [ + "source=${env:HOME}/.gitconfig,target=/root/.gitconfig,type=bind,consistency=cached", + "source=${env:SSH_AUTH_SOCK},target=/ssh-agent,type=bind" + ], + "remoteEnv": { + "SSH_AUTH_SOCK": "/ssh-agent" + }, + "forwardPorts": [], + "postCreateCommand": "git config --global --add safe.directory /workspaces/${localWorkspaceFolderBasename}", "features": { "ghcr.io/devcontainers/features/azure-cli:1": {}, "ghcr.io/devcontainers-extra/features/devcontainers-cli:1": {} } - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" } From a92591f0ce13babaae4287f6d85be94e7fb3e0c5 Mon Sep 17 00:00:00 2001 From: kevin_mack_msft Date: Mon, 31 Mar 2025 10:40:25 -0400 Subject: [PATCH 2/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index cc83cfb..eba8cd2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,9 +1,9 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu { "name": "devcontainer", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/base:bullseye", + "image": "mcr.microsoft.com/devcontainers/base:jammy", "settings": { "terminal.integrated.shell.linux": "/bin/bash" }, @@ -21,7 +21,6 @@ "forwardPorts": [], "postCreateCommand": "git config --global --add safe.directory /workspaces/${localWorkspaceFolderBasename}", "features": { - "ghcr.io/devcontainers/features/azure-cli:1": {}, - "ghcr.io/devcontainers-extra/features/devcontainers-cli:1": {} + "ghcr.io/devcontainers/features/azure-cli:1": {} } } From 7197e3c0e1f1bdf8a76f8fd307cde748e592ea70 Mon Sep 17 00:00:00 2001 From: kevin_mack_msft Date: Mon, 31 Mar 2025 10:44:01 -0400 Subject: [PATCH 3/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index eba8cd2..714a700 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -19,7 +19,7 @@ "SSH_AUTH_SOCK": "/ssh-agent" }, "forwardPorts": [], - "postCreateCommand": "git config --global --add safe.directory /workspaces/${localWorkspaceFolderBasename}", + "postCreateCommand": "mkdir -p ${env:HOME} && touch ${env:HOME}/.gitconfig && git config --global --add safe.directory /workspaces/${localWorkspaceFolderBasename}", "features": { "ghcr.io/devcontainers/features/azure-cli:1": {} } From a42ac122b3d94252dd321a54b092d198be7b916d Mon Sep 17 00:00:00 2001 From: kevin_mack_msft Date: Mon, 31 Mar 2025 10:46:57 -0400 Subject: [PATCH 4/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 714a700..d7bcee2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu { - "name": "devcontainer", + "name": "Ubuntu", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "image": "mcr.microsoft.com/devcontainers/base:jammy", "settings": { @@ -12,8 +12,8 @@ "ms-vscode-remote.remote-containers" ], "mounts": [ - "source=${env:HOME}/.gitconfig,target=/root/.gitconfig,type=bind,consistency=cached", - "source=${env:SSH_AUTH_SOCK},target=/ssh-agent,type=bind" + "source=${localEnv:HOME}/.gitconfig,target=/root/.gitconfig,type=bind,consistency=cached,required=false", + "source=${localEnv:SSH_AUTH_SOCK},target=/ssh-agent,type=bind" ], "remoteEnv": { "SSH_AUTH_SOCK": "/ssh-agent"