From 681ca4e15be3da52ee506c47a02089c13dc08c16 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 5 Sep 2024 19:19:03 -0400 Subject: [PATCH 1/5] Update devcontainer.json Signed-off-by: Sidney Andrews --- .devcontainer/devcontainer.json | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 21a7b5d..8230801 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,32 +1,15 @@ { - "build": { - "dockerfile": "./Dockerfile", - "context": "." - }, + "image": "mcr.microsoft.com/devcontainers/dotnet:latest", "features": { "ghcr.io/azure/azure-dev/azd:latest": {}, - "ghcr.io/devcontainers/features/docker-in-docker:2": {}, - "ghcr.io/devcontainers/features/common-utils:2": { - "installZsh": "true", - "username": "vscode", - "userUid": "1000", - "userGid": "1000", - "upgradePackages": "true" - }, - "ghcr.io/devcontainers/features/node:1": { - "version": "none" - }, - "ghcr.io/devcontainers/features/git:1": { - "version": "latest", - "ppa": "false" - } + "ghcr.io/devcontainers/features/azure-cli:latest": {}, + "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, "customizations": { "vscode": { "extensions": [ - "ms-dotnettools.csharp" + "ms-dotnettools.csdevkit" ] } - }, - "remoteUser": "vscode" + } } From 7359477b0cea9d16765d7a73d58efb8dc8faf207 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 5 Sep 2024 19:19:10 -0400 Subject: [PATCH 2/5] Delete .devcontainer/Dockerfile Signed-off-by: Sidney Andrews --- .devcontainer/Dockerfile | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index c9881d2..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -ARG VARIANT=8.0 -FROM mcr.microsoft.com/dotnet/sdk:${VARIANT} -ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools \ No newline at end of file From 7d24b11f3f98489932f5a10c26240cfb9d49f435 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 5 Sep 2024 19:24:23 -0400 Subject: [PATCH 3/5] Add workload commands --- .devcontainer/devcontainer.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8230801..8d06b69 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,6 +5,8 @@ "ghcr.io/devcontainers/features/azure-cli:latest": {}, "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, + "onCreateCommand": "dotnet workload update", + "updateContentCommand": "dotnet build src/Cosmos.Samples.NoSQL.Quickstart.sln", "customizations": { "vscode": { "extensions": [ From 1dedbadc39f1fd6b0770ae7429f1d3c7b8bb96e1 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 5 Sep 2024 19:42:13 -0400 Subject: [PATCH 4/5] Update devcontainer.json Signed-off-by: Sidney Andrews --- .devcontainer/devcontainer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8d06b69..49f516f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,6 @@ "ghcr.io/devcontainers/features/azure-cli:latest": {}, "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, - "onCreateCommand": "dotnet workload update", "updateContentCommand": "dotnet build src/Cosmos.Samples.NoSQL.Quickstart.sln", "customizations": { "vscode": { From b9951a5865b8e6619376fba13a78c6ad856b93e9 Mon Sep 17 00:00:00 2001 From: Sidney Andrews Date: Thu, 5 Sep 2024 19:48:51 -0400 Subject: [PATCH 5/5] Update devcontainer.json Signed-off-by: Sidney Andrews --- .devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 49f516f..dca9c3d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,11 +5,11 @@ "ghcr.io/devcontainers/features/azure-cli:latest": {}, "ghcr.io/devcontainers/features/docker-in-docker:2": {} }, - "updateContentCommand": "dotnet build src/Cosmos.Samples.NoSQL.Quickstart.sln", "customizations": { "vscode": { "extensions": [ - "ms-dotnettools.csdevkit" + "ms-dotnettools.csdevkit", + "ms-azuretools.azure-dev" ] } }