Skip to content

Commit 8849d87

Browse files
authored
Merge pull request #5421 from faermanj/devbox-update
🌱 Devbox update
2 parents b1ab3af + 32d37b9 commit 8849d87

File tree

4 files changed

+665
-50
lines changed

4 files changed

+665
-50
lines changed

.devcontainer/capa-devbox/devcontainer.json renamed to .devcontainer/devcontainer.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{
2-
"name": "CAPA Devcontainer+Devbox",
3-
"image": "mcr.microsoft.com/devcontainers/go",
2+
"name": "CAPA Devcontainer + Devbox + VSCode",
3+
"image": "mcr.microsoft.com/devcontainers/base",
44
"features": {
55
"ghcr.io/dlouwers/devcontainer-features/devbox:1": {},
66
"ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {},
7-
"ghcr.io/devcontainers-contrib/features/kind:1.0.14": {},
8-
"ghcr.io/rio/features/k9s:1.1.5": {},
9-
"ghcr.io/audacioustux/devcontainers/tilt:1.0.1": {},
107
"ghcr.io/devcontainers/features/kubectl-helm-minikube:1.2.0": {
118
"version": "latest",
12-
"helm": "latest",
9+
"helm": "none",
1310
"minikube": "none"
1411
}
1512
},
@@ -19,9 +16,13 @@
1916
"settings": {},
2017
"extensions": [
2118
"jetpack-io.devbox",
19+
"foxundermoon.shell-format",
2220
"golang.go",
21+
"ethan-reesor.vscode-go-test-adapter",
2322
"ms-kubernetes-tools.vscode-kubernetes-tools",
24-
"ms-azuretools.vscode-dockerr"
23+
"ms-kubernetes-tools.kubernetes-ide",
24+
"ms-azuretools.vscode-dockerr",
25+
"redhat.vscode-yaml"
2526
]
2627
}
2728
}

devbox.json

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,28 @@
22
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json",
33
"packages": [
44
5-
"kubectl",
6-
"kind",
7-
"docker",
8-
"helm",
9-
"jq",
10-
"yq",
11-
"git",
12-
"k9s",
13-
"tilt",
14-
"awscli"
5+
"kind@latest",
6+
"docker@latest",
7+
"jq@latest",
8+
"yq@latest",
9+
"git@latest",
10+
"k9s@latest",
11+
"tilt@latest",
12+
"awscli2@latest",
13+
"direnv@latest",
14+
"kustomize@latest"
1515
],
1616
"shell": {
17+
"init_hook": [
18+
"./scripts/devbox-init-hook.sh"
19+
],
1720
"scripts": {
21+
"clean": [
22+
"make clean"
23+
],
1824
"build": [
19-
"make clusterawsadm"
25+
"make generate && make clusterawsadm"
2026
]
2127
}
2228
}
23-
}
29+
}

0 commit comments

Comments
 (0)