diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index d894f0f..0000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM mcr.microsoft.com/devcontainers/go:1.26-trixie@sha256:232b16db710cedd1ad955e78ef973d6252ddc1149f299b1eaeb1caaa8c61caf8 - -USER vscode - -# renovate: datasource=github-releases depName=golangci/golangci-lint extractVersion=^v(?.*)$ -ARG GOLANGCI_LINT_VERSION=2.13.2 - -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sudo sh -s -- v${GOLANGCI_LINT_VERSION} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b04e80e..5898f8d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,56 +1,14 @@ { - "name": "NodeIP Discovery DevContainer", - "build": { - "dockerfile": "Dockerfile" - }, - "features": { - "ghcr.io/devcontainers/features/docker-in-docker:3": { - "dockerDashComposeVersion": "none", - "moby": false - }, - "ghcr.io/devcontainers/features/github-cli:1": {}, - "ghcr.io/devcontainers/features/git:1": {} - }, - + "name": "NodeIP Discovery", + // Tools, features and shared settings come from the image. + // See https://github.com/scality/devcontainers + "image": "ghcr.io/scality/devcontainers/go-k8s:pr-1@sha256:daaa2f191f209e4890313562294e374c950c706c0976da0d92f0d64c593861e7", "customizations": { "vscode": { - "settings": { - "telemetry.telemetryLevel": "off", - "redhat.telemetry.enabled": false, - "editor.renderWhitespace": "all", - "terminal.integrated.profiles.linux": { - "zsh": { - "path": "/usr/bin/zsh" - } - }, - "terminal.integrated.defaultProfile.linux": "zsh", - "python.terminal.activateEnvironment": false - }, "extensions": [ - //Kubernetes support - "ms-kubernetes-tools.vscode-kubernetes-tools", - //Create TODO and FIXME tree - "Gruntfuggly.todo-tree", - //Go support - "golang.go", - //Remote container support - "ms-vscode-remote.remote-containers", - //YAML support - "redhat.vscode-yaml", - //Github Action helper - "github.vscode-github-actions", - //Docker helper - "ms-azuretools.vscode-docker", - //Gherkin support and helper - "CucumberOpen.cucumber-official", - //Mardown support - "yzhang.markdown-all-in-one", - //Compare text selections - "ryu1kn.partial-diff", - //Ginko support - "joselitofilho.ginkgotestexplorer" + // Gherkin support and helper + "CucumberOpen.cucumber-official" ] } - }, - "remoteUser": "vscode" + } } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e0a9e3..b7e96ea 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,6 +13,8 @@ its architecture see [DESIGN.md](DESIGN.md). A ready-to-use [dev container](.devcontainer/) is provided with the Go toolchain, Docker-in-Docker, and the recommended VS Code extensions. Opening the repository in a supporting editor is the quickest way to get a consistent environment. +It uses a prebuilt image from [scality/devcontainers](https://github.com/scality/devcontainers). +The image is private: log in to `ghcr.io` once, as described in that repository's README. Everyday commands: