Skip to content

Commit 081ac21

Browse files
bootc-dev Botcgwalters
authored andcommitted
Sync common files from infra repository
Synchronized from bootc-dev/infra@eee9b69. Signed-off-by: bootc-dev Bot <bot@bootc.dev>
1 parent 5b3f114 commit 081ac21

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

.bootc-dev-infra-commit.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eb09fd52a83e77dad0465baded5c982c23bd5414
1+
eee9b691c9fcf5783ca044671dade3e32efd7e7b

.devcontainer/devcontainer.json

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
11
{
22
"name": "bootc-devenv-debian",
3-
// TODO override this back to prod image
43
"image": "ghcr.io/bootc-dev/devenv-debian",
54
"customizations": {
65
"vscode": {
7-
// Abitrary, but most of our code is in one of these two
6+
// Arbitrary, but most of our code is in one of these two
87
"extensions": [
98
"rust-lang.rust-analyzer",
109
"golang.Go"
1110
]
11+
},
12+
"devaipod": {
13+
// When running under devaipod, use minimal capabilities
14+
// (SYS_ADMIN, NET_ADMIN, etc.) instead of full --privileged.
15+
"nestedContainers": true
1216
}
1317
},
1418
"features": {},
15-
"runArgs": [
16-
// In general we hope that the outer environment has set up
17-
// a user namespace to keep this secure.
18-
"--cap-add=all",
19-
// Required for mounting /proc in nested user namespace
20-
"--security-opt", "label=disable",
21-
// Allows access to /proc paths needed for nested containers
22-
"--security-opt", "unmask=/proc/*",
23-
// Device access for nested containers and VMs
24-
"--device", "/dev/net/tun",
25-
// I always want KVM
26-
"--device", "/dev/kvm"
27-
],
19+
// Use privileged mode for broad compatibility (Codespaces, Docker,
20+
// stock devcontainer CLI). devaipod overrides this with tighter
21+
// security via the nestedContainers customization above.
22+
"privileged": true,
2823
"postCreateCommand": {
2924
// Our init script
3025
"devenv-init": "sudo /usr/local/bin/devenv-init.sh"
@@ -33,4 +28,3 @@
3328
"PATH": "${containerEnv:PATH}:/usr/local/cargo/bin"
3429
}
3530
}
36-

0 commit comments

Comments
 (0)