Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cpp-mariadb/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion src/cpp-mariadb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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.
Expand Down
8 changes: 4 additions & 4 deletions src/cpp-mariadb/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -9,14 +9,14 @@
"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"
],
"default": "debian-11"
"default": "debian-13"
},
"reinstallCmakeVersionFromSource": {
"type": "string",
Expand Down
3 changes: 1 addition & 2 deletions src/cpp/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +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}"

# Optionally install the cmake for vcpkg
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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, 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.
Expand Down
8 changes: 4 additions & 4 deletions src/cpp/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -9,14 +9,14 @@
"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"
],
"default": "debian-11"
"default": "debian-13"
},
"reinstallCmakeVersionFromSource": {
"type": "string",
Expand Down
Loading