Skip to content

Commit

Permalink
chore: update devcontainer to modern standard
Browse files Browse the repository at this point in the history
  • Loading branch information
artis3n authored Dec 22, 2023
1 parent 2c4a1ec commit 2ab16d6
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 937 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2.1
jobs:
build:
# https://circleci.com/docs/configuration-reference#available-linux-machine-images
# https://circleci.com/docs/configuration-reference/#available-linux-machine-images-cloud
machine:
image: ubuntu-2204:2022.10.2
image: ubuntu-2204:2023.10.1
# https://circleci.com/docs/2.0/configuration-reference/#resourceclass
resource_class: large
steps:
Expand Down
43 changes: 0 additions & 43 deletions .devcontainer/Dockerfile

This file was deleted.

61 changes: 26 additions & 35 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,33 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-in-docker
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/debian
{
"name": "Docker in Docker",
"dockerFile": "Dockerfile",
"runArgs": ["--init", "--privileged"],
"mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"],
"overrideCommand": false,
"name": "Debian",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/base:bookworm",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"installOhMyZsh": true,
"upgradePackages": true
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"dockerDashComposeVersion": "v2"
},
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/git-lfs:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/dhoeric/features/hadolint:1": {},
"ghcr.io/devcontainers-contrib/features/dive:1": {}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Configure tool-specific properties.
"customizations": {
// Configure properties specific to VS Code.
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-azuretools.vscode-docker",
"yzhang.markdown-all-in-one"
]
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "docker --version",
"onCreateCommand": "brew install dive hadolint",
"postCreateCommand": "make install",
// Configure tool-specific properties.
// "customizations": {},

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode",
"build": {
"args": {
"UPGRADE_PACKAGES": "true"
}
},
"features": {
"git": "latest",
"github-cli": "latest",
"homebrew": "latest"
}
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
Loading

0 comments on commit 2ab16d6

Please sign in to comment.