From ef096459f9002937269031ec7793f354f0b13c85 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Fri, 12 Sep 2025 10:11:56 +0000 Subject: [PATCH 1/3] [cpp,cpp-mariadb]- Add support for debian trixie(13) --- src/cpp-mariadb/.devcontainer/Dockerfile | 2 +- src/cpp-mariadb/README.md | 2 +- src/cpp-mariadb/devcontainer-template.json | 5 +++-- src/cpp/.devcontainer/Dockerfile | 2 +- src/cpp/README.md | 2 +- src/cpp/devcontainer-template.json | 5 +++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/cpp-mariadb/.devcontainer/Dockerfile b/src/cpp-mariadb/.devcontainer/Dockerfile index fab07762..cf32009b 100644 --- a/src/cpp-mariadb/.devcontainer/Dockerfile +++ b/src/cpp-mariadb/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant} # Everything below this is needed for installing MariaDB # Instructions are copied and modified from: https://mariadb.com/docs/clients/mariadb-connectors/connector-cpp/install/ diff --git a/src/cpp-mariadb/README.md b/src/cpp-mariadb/README.md index 1b8b9ee8..308e5ac9 100644 --- a/src/cpp-mariadb/README.md +++ b/src/cpp-mariadb/README.md @@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 | +| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 | | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/cpp-mariadb/devcontainer-template.json b/src/cpp-mariadb/devcontainer-template.json index 52f4868d..4b837bbd 100644 --- a/src/cpp-mariadb/devcontainer-template.json +++ b/src/cpp-mariadb/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "cpp-mariadb", - "version": "3.0.3", + "version": "4.0.0", "name": "C++ & MariaDB", "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp-mariadb", @@ -11,12 +11,13 @@ "type": "string", "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", "proposals": [ + "debian-13", "debian-12", "debian-11", "ubuntu-24.04", "ubuntu-22.04" ], - "default": "debian-11" + "default": "debian-13" }, "reinstallCmakeVersionFromSource": { "type": "string", diff --git a/src/cpp/.devcontainer/Dockerfile b/src/cpp/.devcontainer/Dockerfile index c105b812..1f7e4e08 100644 --- a/src/cpp/.devcontainer/Dockerfile +++ b/src/cpp/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/cpp:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant} ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="${templateOption:reinstallCmakeVersionFromSource}" diff --git a/src/cpp/README.md b/src/cpp/README.md index c2a7000c..c975088f 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 | +| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 | | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/cpp/devcontainer-template.json b/src/cpp/devcontainer-template.json index 569f63c6..5da6cd5f 100644 --- a/src/cpp/devcontainer-template.json +++ b/src/cpp/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "cpp", - "version": "3.0.3", + "version": "4.0.0", "name": "C++", "description": "Develop C++ applications on Linux. Includes Debian C++ build tools.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/cpp", @@ -11,12 +11,13 @@ "type": "string", "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", "proposals": [ + "debian-13", "debian-12", "debian-11", "ubuntu-24.04", "ubuntu-22.04" ], - "default": "debian-11" + "default": "debian-13" }, "reinstallCmakeVersionFromSource": { "type": "string", From fd06d1f44b269eb23da062f55f4cd6506d3fc6fc Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Mon, 29 Sep 2025 07:51:33 +0000 Subject: [PATCH 2/3] re-trigger --- src/cpp/.devcontainer/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/cpp/.devcontainer/Dockerfile b/src/cpp/.devcontainer/Dockerfile index 1f7e4e08..9e96c66c 100644 --- a/src/cpp/.devcontainer/Dockerfile +++ b/src/cpp/.devcontainer/Dockerfile @@ -1,5 +1,4 @@ FROM mcr.microsoft.com/devcontainers/cpp:2-${templateOption:imageVariant} - ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="${templateOption:reinstallCmakeVersionFromSource}" # Optionally install the cmake for vcpkg From 4d641245f8930dfe24b15a808f4e4d6fce47e7c4 Mon Sep 17 00:00:00 2001 From: sireeshajonnalagadda Date: Mon, 29 Sep 2025 07:58:58 +0000 Subject: [PATCH 3/3] removed bullseye --- src/cpp-mariadb/README.md | 2 +- src/cpp-mariadb/devcontainer-template.json | 3 +-- src/cpp/README.md | 2 +- src/cpp/devcontainer-template.json | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cpp-mariadb/README.md b/src/cpp-mariadb/README.md index 308e5ac9..38e0458d 100644 --- a/src/cpp-mariadb/README.md +++ b/src/cpp-mariadb/README.md @@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-11 | +| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 | | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/cpp-mariadb/devcontainer-template.json b/src/cpp-mariadb/devcontainer-template.json index 4b837bbd..7cd969a4 100644 --- a/src/cpp-mariadb/devcontainer-template.json +++ b/src/cpp-mariadb/devcontainer-template.json @@ -9,11 +9,10 @@ "options": { "imageVariant": { "type": "string", - "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", + "description": "Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", "proposals": [ "debian-13", "debian-12", - "debian-11", "ubuntu-24.04", "ubuntu-22.04" ], diff --git a/src/cpp/README.md b/src/cpp/README.md index c975088f..d3855abb 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -7,7 +7,7 @@ Develop C++ applications on Linux. Includes Debian C++ build tools. | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 | +| imageVariant | Debian / Ubuntu version (use Debian 13, Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon): | string | debian-13 | | reinstallCmakeVersionFromSource | Install CMake version different from what base image has already installed. | string | none | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/cpp/devcontainer-template.json b/src/cpp/devcontainer-template.json index 5da6cd5f..9f9221ac 100644 --- a/src/cpp/devcontainer-template.json +++ b/src/cpp/devcontainer-template.json @@ -9,11 +9,10 @@ "options": { "imageVariant": { "type": "string", - "description": "Debian / Ubuntu version (use Debian 12, Debian 11, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", + "description": "Debian / Ubuntu version (use Debian 12, Ubuntu 24.04, and Ubuntu 22.04 on local arm64/Apple Silicon):", "proposals": [ "debian-13", "debian-12", - "debian-11", "ubuntu-24.04", "ubuntu-22.04" ],