Skip to content

Commit d3c3e60

Browse files
Merge pull request #57 from testcontainers/devcontainer-cmake
Use CMake pinned version from the Dev Containers feature
2 parents 39a591e + 58ead56 commit d3c3e60

File tree

3 files changed

+18
-4
lines changed

3 files changed

+18
-4
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM debian:bookworm-20250317
33
RUN apt-get update
44
RUN apt-get install -y \
55
build-essential git checkinstall libssl-dev openssl software-properties-common \
6-
cmake golang-go \
6+
golang-go \
77
python3.11 python3-pip python3.11-venv libsass-dev libcairo2 libpango-1.0-0 libpangoft2-1.0-0 pangocairo-1.0 pngquant \
88
sudo
99

.devcontainer/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ does not yet include the build tools.
88
- C/C++ - For building the project itself
99
- Docker-in-Docker - For the included integration tests
1010
- Python/MkDocs - for the project site and documentation development
11+
12+
13+
## Credits
14+
15+
- For MkDocs stack - [hitsumabushi845/MkDocs-with-Remote-Containers](https://github.com/hitsumabushi845/MkDocs-with-Remote-Containers)

.devcontainer/devcontainer.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
// Credits - https://github.com/hitsumabushi845/MkDocs-with-Remote-Containers
1+
// See the README for details
22
{
33
"name": "Testcontainers Native Development",
44
"dockerFile": "Dockerfile",
55
"features": {
66
"ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {
77
"version": "latest",
88
"moby": true
9+
},
10+
"ghcr.io/devcontainers-extra/features/cmake:1": {
11+
"version": "3.31.9"
12+
},
13+
"ghcr.io/msclock/features/vcpkg:2": {
14+
"version": "stable",
15+
"vcpkgAutoUpdate": true
916
}
1017
},
1118
"customizations": {
@@ -21,7 +28,7 @@
2128
"ms-vscode.cmake-tools",
2229
"ms-vscode.makefile-tools",
2330
"ms-vscode.cpptools-extension-pack",
24-
"ms-azuretools.vscode-docker",
31+
"cschlosser.doxdocgen",
2532
// Golang development
2633
"golang.go",
2734
// Generic site and documentation development
@@ -32,7 +39,9 @@
3239
"oderwat.indent-rainbow",
3340
"msjsdiag.debugger-for-chrome",
3441
// GitHub Actions
35-
"github.vscode-github-actions"
42+
"github.vscode-github-actions",
43+
// Containers
44+
"ms-azuretools.vscode-docker"
3645
],
3746
},
3847
},

0 commit comments

Comments
 (0)