From edbf12f3c05af8852da1377243b0dfa081d51e19 Mon Sep 17 00:00:00 2001 From: William Sciaroni Date: Tue, 24 Mar 2026 20:57:36 -0500 Subject: [PATCH] Update devcontainers to remove CMake version --- .devcontainer/Dockerfile | 24 ++++++++++++++++++++++-- .devcontainer/clang10/devcontainer.json | 3 ++- .devcontainer/clang11/devcontainer.json | 3 ++- .devcontainer/clang12/devcontainer.json | 3 ++- .devcontainer/clang13/devcontainer.json | 3 ++- .devcontainer/clang14/devcontainer.json | 3 ++- .devcontainer/clang15/devcontainer.json | 3 ++- .devcontainer/clang16/devcontainer.json | 3 ++- .devcontainer/clang17/devcontainer.json | 3 ++- .devcontainer/clang18/devcontainer.json | 3 ++- .devcontainer/clang19/devcontainer.json | 3 ++- .devcontainer/clang20/devcontainer.json | 3 ++- .devcontainer/clang21/devcontainer.json | 13 +++++++++++++ .devcontainer/clang7/devcontainer.json | 3 ++- .devcontainer/clang8/devcontainer.json | 3 ++- .devcontainer/clang9/devcontainer.json | 3 ++- .devcontainer/devcontainer.json | 3 +-- .devcontainer/gcc09/devcontainer.json | 3 ++- .devcontainer/gcc10/devcontainer.json | 3 ++- .devcontainer/gcc11/devcontainer.json | 3 ++- .devcontainer/gcc12/devcontainer.json | 3 ++- .devcontainer/gcc13/devcontainer.json | 3 ++- .devcontainer/gcc14/devcontainer.json | 3 ++- .devcontainer/gcc15/devcontainer.json | 3 ++- 24 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 .devcontainer/clang21/devcontainer.json diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 15c2baae..9a0b43e6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -35,8 +35,28 @@ RUN set -eux \ fi \ && apt-get update \ && apt-get -y install --no-install-recommends \ + python3-full \ + python3-pip \ git \ wget \ - python3-cogapp \ cmake \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && if pip help install | grep -q '\-\-break-system-packages'; then \ + pip install --no-cache-dir --break-system-packages cogapp; \ + else \ + pip install --no-cache-dir cogapp; \ + fi + +RUN set -eux \ + && echo "Pip version: " \ + && pip --version \ + && echo "Cogapp version: " \ + && pip show cogapp \ + && echo "Git version: " \ + && git --version \ + && echo "Wget version: " \ + && wget --version \ + && echo "Cmake version: " \ + && cmake --version \ + && echo "Make version: " \ + && make --version diff --git a/.devcontainer/clang10/devcontainer.json b/.devcontainer/clang10/devcontainer.json index d34b0411..d62c3ce3 100644 --- a/.devcontainer/clang10/devcontainer.json +++ b/.devcontainer/clang10/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:10" + "BASE_IMAGE_NAME": "silkeh/clang:10", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang11/devcontainer.json b/.devcontainer/clang11/devcontainer.json index 6727e497..e83ec9f4 100644 --- a/.devcontainer/clang11/devcontainer.json +++ b/.devcontainer/clang11/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:11" + "BASE_IMAGE_NAME": "silkeh/clang:11", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang12/devcontainer.json b/.devcontainer/clang12/devcontainer.json index 26ab72ca..6a6407cf 100644 --- a/.devcontainer/clang12/devcontainer.json +++ b/.devcontainer/clang12/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:12" + "BASE_IMAGE_NAME": "silkeh/clang:12", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang13/devcontainer.json b/.devcontainer/clang13/devcontainer.json index 309ced68..46197161 100644 --- a/.devcontainer/clang13/devcontainer.json +++ b/.devcontainer/clang13/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:13" + "BASE_IMAGE_NAME": "silkeh/clang:13", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang14/devcontainer.json b/.devcontainer/clang14/devcontainer.json index ecdf0ad9..13512eff 100644 --- a/.devcontainer/clang14/devcontainer.json +++ b/.devcontainer/clang14/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:14" + "BASE_IMAGE_NAME": "silkeh/clang:14", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang15/devcontainer.json b/.devcontainer/clang15/devcontainer.json index 35a1ccef..42051a63 100644 --- a/.devcontainer/clang15/devcontainer.json +++ b/.devcontainer/clang15/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:15" + "BASE_IMAGE_NAME": "silkeh/clang:15", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang16/devcontainer.json b/.devcontainer/clang16/devcontainer.json index aa9b25ee..8284ae3a 100644 --- a/.devcontainer/clang16/devcontainer.json +++ b/.devcontainer/clang16/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:16" + "BASE_IMAGE_NAME": "silkeh/clang:16", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang17/devcontainer.json b/.devcontainer/clang17/devcontainer.json index deb08dbb..ca9747fa 100644 --- a/.devcontainer/clang17/devcontainer.json +++ b/.devcontainer/clang17/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:17" + "BASE_IMAGE_NAME": "silkeh/clang:17", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang18/devcontainer.json b/.devcontainer/clang18/devcontainer.json index d7954145..5ff70469 100644 --- a/.devcontainer/clang18/devcontainer.json +++ b/.devcontainer/clang18/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:18-bullseye" + "BASE_IMAGE_NAME": "silkeh/clang:18-bullseye", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang19/devcontainer.json b/.devcontainer/clang19/devcontainer.json index 7c525acf..bc617a36 100644 --- a/.devcontainer/clang19/devcontainer.json +++ b/.devcontainer/clang19/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:19-bullseye" + "BASE_IMAGE_NAME": "silkeh/clang:19-bullseye", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang20/devcontainer.json b/.devcontainer/clang20/devcontainer.json index 0dadc10b..5522774f 100644 --- a/.devcontainer/clang20/devcontainer.json +++ b/.devcontainer/clang20/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:20-bullseye" + "BASE_IMAGE_NAME": "silkeh/clang:20-bullseye", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang21/devcontainer.json b/.devcontainer/clang21/devcontainer.json new file mode 100644 index 00000000..d95a6d6e --- /dev/null +++ b/.devcontainer/clang21/devcontainer.json @@ -0,0 +1,13 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/cpp +{ + "name": "Clang 22", + "build": { + "dockerfile": "../Dockerfile", + "args": { + "BASE_IMAGE_NAME": "silkeh/clang:22-bullseye", + "DEBIAN_SNAPSHOT": "none" + }, + "context": "../context" + } +} diff --git a/.devcontainer/clang7/devcontainer.json b/.devcontainer/clang7/devcontainer.json index 09a67efa..87d7c7e1 100644 --- a/.devcontainer/clang7/devcontainer.json +++ b/.devcontainer/clang7/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:7" + "BASE_IMAGE_NAME": "silkeh/clang:7", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang8/devcontainer.json b/.devcontainer/clang8/devcontainer.json index 99a853e5..c29c069c 100644 --- a/.devcontainer/clang8/devcontainer.json +++ b/.devcontainer/clang8/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:8" + "BASE_IMAGE_NAME": "silkeh/clang:8", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/clang9/devcontainer.json b/.devcontainer/clang9/devcontainer.json index b77d4f2b..308f8ba2 100644 --- a/.devcontainer/clang9/devcontainer.json +++ b/.devcontainer/clang9/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "silkeh/clang:9" + "BASE_IMAGE_NAME": "silkeh/clang:9", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 59d97da3..5daf6034 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,8 +6,7 @@ "dockerfile": "./Dockerfile", "args": { "BASE_IMAGE_NAME": "mcr.microsoft.com/devcontainers/cpp:2@sha256:a5eb5a1e9109af88bf82ebb0f71903608a68144851ed1e4b852e31b251ac59c6", - "DEBIAN_SNAPSHOT": "20260223T000000Z", - "REINSTALL_CMAKE_VERSION_FROM_SOURCE": "3.31.7" + "DEBIAN_SNAPSHOT": "20260223T000000Z" }, "context": "./context" } diff --git a/.devcontainer/gcc09/devcontainer.json b/.devcontainer/gcc09/devcontainer.json index ab5e64ee..d72b5f3c 100644 --- a/.devcontainer/gcc09/devcontainer.json +++ b/.devcontainer/gcc09/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:9" + "BASE_IMAGE_NAME": "gcc:9", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc10/devcontainer.json b/.devcontainer/gcc10/devcontainer.json index 03bf117e..698402b8 100644 --- a/.devcontainer/gcc10/devcontainer.json +++ b/.devcontainer/gcc10/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:10" + "BASE_IMAGE_NAME": "gcc:10", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc11/devcontainer.json b/.devcontainer/gcc11/devcontainer.json index 9d837fad..c8235db7 100644 --- a/.devcontainer/gcc11/devcontainer.json +++ b/.devcontainer/gcc11/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:11" + "BASE_IMAGE_NAME": "gcc:11", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc12/devcontainer.json b/.devcontainer/gcc12/devcontainer.json index 9c07a79f..bee6541e 100644 --- a/.devcontainer/gcc12/devcontainer.json +++ b/.devcontainer/gcc12/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:12" + "BASE_IMAGE_NAME": "gcc:12", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc13/devcontainer.json b/.devcontainer/gcc13/devcontainer.json index 4b9767e8..7434b808 100644 --- a/.devcontainer/gcc13/devcontainer.json +++ b/.devcontainer/gcc13/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:13" + "BASE_IMAGE_NAME": "gcc:13", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc14/devcontainer.json b/.devcontainer/gcc14/devcontainer.json index 374ff299..33e043b9 100644 --- a/.devcontainer/gcc14/devcontainer.json +++ b/.devcontainer/gcc14/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:14" + "BASE_IMAGE_NAME": "gcc:14", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" } diff --git a/.devcontainer/gcc15/devcontainer.json b/.devcontainer/gcc15/devcontainer.json index 498a6fe8..143d5b16 100644 --- a/.devcontainer/gcc15/devcontainer.json +++ b/.devcontainer/gcc15/devcontainer.json @@ -5,7 +5,8 @@ "build": { "dockerfile": "../Dockerfile", "args": { - "BASE_IMAGE_NAME": "gcc:15" + "BASE_IMAGE_NAME": "gcc:15", + "DEBIAN_SNAPSHOT": "none" }, "context": "../context" }