From 2f4fad98bf3c54bd10216392161a8dc041fb0b86 Mon Sep 17 00:00:00 2001 From: Timothy Rule <34501912+trulede@users.noreply.github.com> Date: Fri, 30 May 2025 20:37:41 +0000 Subject: [PATCH 1/2] Devcontainers basic config. --- .devcontainer/Dockerfile | 13 +++++++++++++ .devcontainer/devcontainer.env | 1 + .devcontainer/devcontainer.json | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 .devcontainer/Dockerfile create mode 100644 .devcontainer/devcontainer.env create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 0000000000..4bfae1f608 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,13 @@ + +FROM mcr.microsoft.com/devcontainers/universal:2 as go_builder +RUN GOBIN=/usr/local/bin go install github.com/rogpeppe/go-internal/cmd/testscript@latest +RUN GOBIN=/usr/local/bin go install github.com/go-task/task/v3/cmd/task@latest + + +FROM mcr.microsoft.com/devcontainers/universal:2 +ENV DEBIAN_FRONTEND=noninteractive +RUN set -eux; \ + wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq; \ + chmod +x /usr/bin/yq; +COPY --from=go_builder /usr/local/bin/testscript /usr/local/bin/testscript +COPY --from=go_builder /usr/local/bin/task /usr/local/bin/task diff --git a/.devcontainer/devcontainer.env b/.devcontainer/devcontainer.env new file mode 100644 index 0000000000..59ec443639 --- /dev/null +++ b/.devcontainer/devcontainer.env @@ -0,0 +1 @@ +TASK_X_REMOTE_TASKFILES=0 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000000..23ae620e1c --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,25 @@ +{ + "build": { + "dockerfile": "Dockerfile", + "context": ".." + }, + "customizations": { + "vscode": { + "extensions": [ + "editorconfig.editorconfig", + "golang.go", + "redhat.vscode-yaml", + "streetsidesoftware.code-spell-checker", + "task.vscode-task" + ] + } + }, + "features": {}, + "runArgs": [ + "--env-file", ".devcontainer/devcontainer.env" + ], + "onCreateCommand": [], + "postCreateCommand": [], + "forwardPorts": [], + "portsAttributes": {} +} From d150bb3d575b4d1e6b8242d058788f7881425fb4 Mon Sep 17 00:00:00 2001 From: Timothy Rule <34501912+trulede@users.noreply.github.com> Date: Sun, 1 Jun 2025 13:02:57 +0000 Subject: [PATCH 2/2] Add golangci-lint to devcontainer. --- .devcontainer/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4bfae1f608..4f6cbcbf93 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/devcontainers/universal:2 as go_builder RUN GOBIN=/usr/local/bin go install github.com/rogpeppe/go-internal/cmd/testscript@latest RUN GOBIN=/usr/local/bin go install github.com/go-task/task/v3/cmd/task@latest - +RUN GOBIN=/usr/local/bin go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest FROM mcr.microsoft.com/devcontainers/universal:2 ENV DEBIAN_FRONTEND=noninteractive @@ -11,3 +11,4 @@ RUN set -eux; \ chmod +x /usr/bin/yq; COPY --from=go_builder /usr/local/bin/testscript /usr/local/bin/testscript COPY --from=go_builder /usr/local/bin/task /usr/local/bin/task +COPY --from=go_builder /usr/local/bin/golangci-lint /usr/local/bin/golangci-lint