Skip to content

Commit d21aaa5

Browse files
authored
devcontainer: Modernize devcontainer, bump version (#37142)
* devcontainer: Modernize devcontainer, bump version - bump base image versions to 97 to match CI - convert some of the runCmd docker options into dedicated properties Signed-off-by: Maciej Grela <m.grela@samsung.com> * retry darwin * devcontainer: Bind dbus system bus for BLE commissioning Signed-off-by: Maciej Grela <m.grela@samsung.com> * Revert "devcontainer: Bind dbus system bus for BLE commissioning" This reverts commit 28897b6. --------- Signed-off-by: Maciej Grela <m.grela@samsung.com>
1 parent 22cd392 commit d21aaa5

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

.devcontainer/devcontainer.json

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
{
22
"name": "CHIP Ubuntu Development Environment",
33
"runArgs": [
4-
"--cap-add=SYS_PTRACE",
5-
"--security-opt",
6-
"seccomp=unconfined",
74
"--network=host",
8-
"--privileged",
9-
"-v",
10-
"/dev/bus/usb:/dev/bus/usb:ro",
115
"--device-cgroup-rule=a 189:* rmw",
126
"--add-host=host.docker.internal:host-gateway"
137
],
8+
"privileged": true,
9+
"capAdd": ["SYS_PTRACE"],
10+
"securityOpt": ["seccomp=unconfined"],
1411
"mounts": [
15-
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
12+
{
13+
"source": "/var/run/docker.sock",
14+
"target": "/var/run/docker.sock",
15+
"type": "bind"
16+
},
17+
{
18+
"source": "/dev/bus/usb",
19+
"target": "/dev/bus/usb",
20+
"type": "bind"
21+
}
1622
],
17-
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
23+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
1824
"image": "matter-dev-environment:local",
1925
"remoteUser": "vscode",
2026
"containerEnv": {

0 commit comments

Comments
 (0)