From ea93407c3fb63ea042c692524076a8fb67826075 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Mon, 13 Nov 2023 16:07:11 -0800 Subject: [PATCH 1/7] rm deprecated extension --- .devcontainer.json | 1 - devcontainer.json | 1 - 2 files changed, 2 deletions(-) diff --git a/.devcontainer.json b/.devcontainer.json index 2cf9a55..91070b1 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -38,7 +38,6 @@ "ms-python.python", "jetpack-io.devbox", "redhat.vscode-yaml", - "eg2.vscode-npm-script", "esbenp.prettier-vscode", "ms-vscode.makefile-tools", "ms-azuretools.vscode-docker", diff --git a/devcontainer.json b/devcontainer.json index 2cf9a55..91070b1 100644 --- a/devcontainer.json +++ b/devcontainer.json @@ -38,7 +38,6 @@ "ms-python.python", "jetpack-io.devbox", "redhat.vscode-yaml", - "eg2.vscode-npm-script", "esbenp.prettier-vscode", "ms-vscode.makefile-tools", "ms-azuretools.vscode-docker", From 888d6845113fe7a4a561fa96fdd68b0e73a680dd Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Mon, 13 Nov 2023 16:10:46 -0800 Subject: [PATCH 2/7] add symbolic link for codespaces --- .devcontainer.json | 63 +--------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) mode change 100644 => 120000 .devcontainer.json diff --git a/.devcontainer.json b/.devcontainer.json deleted file mode 100644 index 91070b1..0000000 --- a/.devcontainer.json +++ /dev/null @@ -1,62 +0,0 @@ -// Reference: -// - https://containers.dev/features -// - https://containers.dev/implementors/features -// - https://code.visualstudio.com/docs/getstarted/settings -{ - // NOTE: remove `image` and uncomment `build` to build the image locally - //"build": { - // "dockerfile": "Dockerfile", - // "context": "." - //}, - "name": "pulumi", - "image": "ghcr.io/pulumi/devcontainer", - "settings": { - "terminal.integrated.shell.linux": "/usr/bin/zsh" - }, - "customizations": { - "vscode": { - "settings": [ - "go.testTags", "all", - "go.buildTags", "all", - "editor.minimap.enabled", false, - "explorer.openEditors.visible", 1, - "editor.quickSuggestionsDelay", 0, - "editor.suggestSelection", "first", - "editor.snippetSuggestions", "top", - "editor.gotoLocation.multipleReferences", "goto", - "editor.gotoLocation.multipleDefinitions", "goto", - "editor.gotoLocation.multipleDeclarations", "goto", - "editor.gotoLocation.multipleImplementations", "goto", - "editor.gotoLocation.multipleTypeDefinitions", "goto", - "files.trimTrailingWhitespace", true, - "files.trimFinalNewlines", true - ], - "extensions": [ - "golang.go", - "vscodevim.vim", - "github.copilot", - "ms-python.python", - "jetpack-io.devbox", - "redhat.vscode-yaml", - "esbenp.prettier-vscode", - "ms-vscode.makefile-tools", - "ms-azuretools.vscode-docker", - "github.vscode-pull-request-github", - "ms-vscode-remote.remote-containers", - "visualstudioexptteam.vscodeintellicode", - "bierner.markdown-preview-github-styles" - ] - } - }, - "features": { - "ghcr.io/devcontainers/features/common-utils:2": {}, - "ghcr.io/devcontainers/features/docker-outside-of-docker:1": { - "version": "latest", - "installDockerBuildx": true, - "moby": false - } - }, - "postCreateCommand": "git submodule update --init --recursive", - "remoteUser": "vscode", - "runArgs": ["--network=host"] -} diff --git a/.devcontainer.json b/.devcontainer.json new file mode 120000 index 0000000..62b9558 --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1 @@ +devcontainer.json \ No newline at end of file From ea758f258ac89ab2bcaaef193e7b4d431f0aa23c Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Tue, 14 Nov 2023 11:04:12 -0800 Subject: [PATCH 3/7] fix qemu gha build failure --- Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14a4f59..f7bddb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,8 @@ ENV TZ=UTC ENV DEBIAN_FRONTEND=noninteractive # Add go and nix to path ENV PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/nix/var/nix/profiles/default/bin" +# Set necessary nix environment variable +ENV NIX_INSTALLER_EXTRA_CONF='filter-syscalls = false' # Default to MS FROM image builtin user USER vscode @@ -101,11 +103,11 @@ RUN set -ex \ RUN set -ex \ && export urlNix="https://install.determinate.systems/nix" \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ - && [ ${arch} = "arm64" ] || curl --proto '=https' --tlsv1.2 -sSf -L ${urlNix} --output /tmp/install.sh \ - && [ ${arch} = "arm64" ] || chmod +x /tmp/install.sh \ - && [ ${arch} = "arm64" ] || /tmp/install.sh install linux --extra-conf "sandbox = false" --init none --no-confirm \ - && [ ${arch} = "arm64" ] || sh -c "nix --version" \ - && [ ${arch} = "arm64" ] || rm -rf /tmp/* \ + && curl --proto '=https' --tlsv1.2 -sSf -L ${urlNix} --output /tmp/install.sh \ + && chmod +x /tmp/install.sh \ + && /tmp/install.sh install linux --extra-conf "sandbox = false" --init none --no-confirm \ + && sh -c "nix --version" \ + && rm -rf /tmp/* \ && true # Install devbox @@ -114,11 +116,11 @@ RUN set -ex \ RUN set -ex \ && export urlDevbox="https://get.jetpack.io/devbox" \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ - && [ ${arch} = "arm64" ] || curl --proto '=https' --tlsv1.2 -sSf -L ${urlDevbox} --output /tmp/install.sh \ - && [ ${arch} = "arm64" ] || chmod +x /tmp/install.sh \ - && [ ${arch} = "arm64" ] || /tmp/install.sh -f \ - && [ ${arch} = "arm64" ] || devbox version \ - && [ ${arch} = "arm64" ] || rm -rf /tmp/* \ + && curl --proto '=https' --tlsv1.2 -sSf -L ${urlDevbox} --output /tmp/install.sh \ + && chmod +x /tmp/install.sh \ + && /tmp/install.sh -f \ + && devbox version \ + && rm -rf /tmp/* \ && true # Install golang From 5a650fbd7c2d6f9dcb361296f18049442b34b8a8 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Tue, 14 Nov 2023 11:14:02 -0800 Subject: [PATCH 4/7] fix qemu gha build failure --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index f7bddb7..d9a66e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -118,6 +118,8 @@ RUN set -ex \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ && curl --proto '=https' --tlsv1.2 -sSf -L ${urlDevbox} --output /tmp/install.sh \ && chmod +x /tmp/install.sh \ + && true +RUN set -ex \ && /tmp/install.sh -f \ && devbox version \ && rm -rf /tmp/* \ From 3c02d16c2d2ff7d9274f393e91d8722e43d950e3 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Tue, 14 Nov 2023 11:23:23 -0800 Subject: [PATCH 5/7] fix qemu gha build failure --- Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9a66e8..f6c77ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,7 +105,11 @@ RUN set -ex \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ && curl --proto '=https' --tlsv1.2 -sSf -L ${urlNix} --output /tmp/install.sh \ && chmod +x /tmp/install.sh \ - && /tmp/install.sh install linux --extra-conf "sandbox = false" --init none --no-confirm \ + && true +RUN set -ex \ + && /tmp/install.sh install linux --init none --extra-conf "filter-syscalls = false" --no-confirm \ + && true +RUN set -ex \ && sh -c "nix --version" \ && rm -rf /tmp/* \ && true @@ -118,8 +122,6 @@ RUN set -ex \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ && curl --proto '=https' --tlsv1.2 -sSf -L ${urlDevbox} --output /tmp/install.sh \ && chmod +x /tmp/install.sh \ - && true -RUN set -ex \ && /tmp/install.sh -f \ && devbox version \ && rm -rf /tmp/* \ From 2f455f7d9e67afd3a4cb16e493db96f6cc8b0332 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Tue, 14 Nov 2023 11:38:59 -0800 Subject: [PATCH 6/7] fix qemu gha build failure --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6c77ad..94cc412 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,11 +105,7 @@ RUN set -ex \ && export arch=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \ && curl --proto '=https' --tlsv1.2 -sSf -L ${urlNix} --output /tmp/install.sh \ && chmod +x /tmp/install.sh \ - && true -RUN set -ex \ && /tmp/install.sh install linux --init none --extra-conf "filter-syscalls = false" --no-confirm \ - && true -RUN set -ex \ && sh -c "nix --version" \ && rm -rf /tmp/* \ && true From 7206e50e38d9d57f972c283c8395129040761124 Mon Sep 17 00:00:00 2001 From: Kat Morgan Date: Wed, 15 Nov 2023 14:17:58 -0800 Subject: [PATCH 7/7] remove local build stanza --- devcontainer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/devcontainer.json b/devcontainer.json index 91070b1..2d4948a 100644 --- a/devcontainer.json +++ b/devcontainer.json @@ -3,11 +3,6 @@ // - https://containers.dev/implementors/features // - https://code.visualstudio.com/docs/getstarted/settings { - // NOTE: remove `image` and uncomment `build` to build the image locally - //"build": { - // "dockerfile": "Dockerfile", - // "context": "." - //}, "name": "pulumi", "image": "ghcr.io/pulumi/devcontainer", "settings": {