From e22fbd319cfb047ef2a9c7fabecda219ac1e4416 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 30 Oct 2023 13:12:14 +0300 Subject: [PATCH 1/4] chore: fix devcontainer.json fixes #10416 --- .devcontainer/devcontainer.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8e190f906d57a..1464c029a3aec 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,9 +4,10 @@ "features": { // See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker - "ghcr.io/devcontainers/features/docker-in-docker:2": {} + "ghcr.io/devcontainers/features/docker-in-docker:2": { + "moby": "false" + } }, // SYS_PTRACE to enable go debugging - // without --priviliged the Github Codespace build fails (not required otherwise) - "runArgs": ["--cap-add=SYS_PTRACE", "--privileged"] + "runArgs": ["--cap-add=SYS_PTRACE"] } From a9fe72167a996d2faa12f7e254cc45f183647876 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 30 Oct 2023 13:16:44 +0300 Subject: [PATCH 2/4] use pre-nix tag --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 1464c029a3aec..a65c411cebd6e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Development environments on your infrastructure", - "image": "codercom/oss-dogfood:latest", + "image": "codercom/oss-dogfood:pre-nix", "features": { // See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker From a940a087fc1d5ae9bf0d7fc4ff31b8e670205b6f Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 30 Oct 2023 13:55:41 +0300 Subject: [PATCH 3/4] Update devcontainer.json --- .devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a65c411cebd6e..b83bbe11521b7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,6 +8,6 @@ "moby": "false" } }, - // SYS_PTRACE to enable go debugging - "runArgs": ["--cap-add=SYS_PTRACE"] + // without --priviliged the Github Codespace build fails (not required otherwise) + "runArgs": ["--cap-add=SYS_PTRACE", "--privileged"] } From 31abd901f943f2085a6cf838f2a8f573de686219 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Mon, 30 Oct 2023 11:20:15 +0000 Subject: [PATCH 4/4] remove privileged --- .devcontainer/devcontainer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b83bbe11521b7..a65c411cebd6e 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -8,6 +8,6 @@ "moby": "false" } }, - // without --priviliged the Github Codespace build fails (not required otherwise) - "runArgs": ["--cap-add=SYS_PTRACE", "--privileged"] + // SYS_PTRACE to enable go debugging + "runArgs": ["--cap-add=SYS_PTRACE"] }