diff --git a/src/cpp/README.md b/src/cpp/README.md index 1851b99217..1d158203db 100644 --- a/src/cpp/README.md +++ b/src/cpp/README.md @@ -9,8 +9,8 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/cpp | -| *Available image variants* | debian13, debian12, ubuntu24.04, ubuntu22.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) | -| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian13`, `debian12`, `ubuntu24.04` and `ubuntu22.04` variants | +| *Available image variants* | debian13, debian12, ubuntu26.04, ubuntu24.04, ubuntu22.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) | +| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian13`, `debian12`, `ubuntu26.04`, `ubuntu24.04` and `ubuntu22.04` variants | | *Container host OS support* | Linux, macOS, Windows | | *Container OS* | Debian, Ubuntu | | *Languages, platforms* | C++ | @@ -26,18 +26,19 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag - `mcr.microsoft.com/devcontainers/cpp:debian13` (or `trixie`) - `mcr.microsoft.com/devcontainers/cpp:debian12` (or `bookworm`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS) +- `mcr.microsoft.com/devcontainers/cpp:ubuntu26.04` (or `resolute`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu24.04` (or `noble`) - `mcr.microsoft.com/devcontainers/cpp:ubuntu22.04` (or `jammy`) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example: -- `mcr.microsoft.com/devcontainers/cpp:2-trixie` -- `mcr.microsoft.com/devcontainers/cpp:2.1-trixie` -- `mcr.microsoft.com/devcontainers/cpp:2.1.9-trixie` -- `mcr.microsoft.com/devcontainers/cpp:2-bookworm` -- `mcr.microsoft.com/devcontainers/cpp:2.1-bookworm` -- `mcr.microsoft.com/devcontainers/cpp:2.1.9-bookworm` +- `mcr.microsoft.com/devcontainers/cpp:3-trixie` +- `mcr.microsoft.com/devcontainers/cpp:3.0-trixie` +- `mcr.microsoft.com/devcontainers/cpp:3.0.0-trixie` +- `mcr.microsoft.com/devcontainers/cpp:3-bookworm` +- `mcr.microsoft.com/devcontainers/cpp:3.0-bookworm` +- `mcr.microsoft.com/devcontainers/cpp:3.0.0-bookworm` However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `0-debian-12`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates. diff --git a/src/cpp/manifest.json b/src/cpp/manifest.json index e7dbc439bb..ab0b210db6 100644 --- a/src/cpp/manifest.json +++ b/src/cpp/manifest.json @@ -1,8 +1,9 @@ { - "version": "2.1.9", + "version": "3.0.0", "variants": [ "trixie", "bookworm", + "resolute", "noble", "jammy" ], @@ -11,6 +12,7 @@ "parent": { "trixie": "base-debian", "bookworm": "base-debian", + "resolute": "base-ubuntu", "noble": "base-ubuntu", "jammy": "base-ubuntu" }, @@ -24,6 +26,10 @@ "linux/amd64", "linux/arm64" ], + "resolute": [ + "linux/amd64", + "linux/arm64" + ], "noble": [ "linux/amd64", "linux/arm64" @@ -45,10 +51,13 @@ "bookworm": [ "cpp:${VERSION}-debian12" ], - "noble": [ - "cpp:${VERSION}-ubuntu24.04", + "resolute": [ + "cpp:${VERSION}-ubuntu26.04", "cpp:${VERSION}-ubuntu" ], + "noble": [ + "cpp:${VERSION}-ubuntu24.04" + ], "jammy": [ "cpp:${VERSION}-ubuntu22.04" ] diff --git a/src/cpp/test-project/CMakeLists.txt b/src/cpp/test-project/CMakeLists.txt index e3641e1138..d7bfd64c4c 100644 --- a/src/cpp/test-project/CMakeLists.txt +++ b/src/cpp/test-project/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.10) project(test-project VERSION 0.1.0) include(CTest)