Skip to content

Commit 595d649

Browse files
authored
Fix broken devcontainer setup (#4588)
* Fix broken devcontainer setup The settings JSON key has an extra array marker in it that VSCode doesn't like. Also, modernise the settings and extensions pieces by nesting them under customizations/vscode. * Add ChangeLog entry for fix
1 parent e23a1da commit 595d649

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

.devcontainer/devcontainer.json

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
{
22
"name": "CMake Tools",
33
"dockerFile": "Dockerfile",
4-
"runArgs": [
4+
"runArgs": [
55
"--cap-add=SYS_PTRACE",
66
"--security-opt",
77
"seccomp=unconfined"
88
],
9-
"settings": {
10-
"terminal.integrated.shell.linux": "/bin/bash"
11-
},
12-
"extensions": [true][
13-
"ms-vscode.cpptools"
14-
]
15-
}
9+
"customizations": {
10+
// Configure properties specific to VS Code.
11+
"vscode": {
12+
// Set *default* container specific settings.json values on container create.
13+
"settings": {
14+
"terminal.integrated.shell.linux": "/bin/bash"
15+
},
16+
"extensions": [
17+
"ms-vscode.cpptools"
18+
]
19+
}
20+
}
21+
}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Bug Fixes:
8585
- Fix bug in which running "CMake: Build" would always run "CMake: Clean Rebuild" when `cmake.buildTask` is enabled [#4421](https://github.com/microsoft/vscode-cmake-tools/issues/4421) [@RedSkittleFox](https://github.com/RedSkittleFox)
8686
- Fix issue with hover provider not checking for undefined. [#4812](https://github.com/microsoft/vscode-cmake-tools/issues/4812)
8787
- Fix bug in which CTest is unable to run large amount of tests in parallel due to regex exceeding command line length limits [#4829](https://github.com/microsoft/vscode-cmake-tools/issues/4829) [@theuke](https://github.com/theuke)
88+
- Fix malformed devcontainer.json used for working with GitHub Codespaces and similar environments [#4588](https://github.com/microsoft/vscode-cmake-tools/pull/4588) [@kaladron](https://github.com/kaladron)
8889

8990
## 1.22.28
9091

0 commit comments

Comments
 (0)