Skip to content

Commit 754376b

Browse files
[cpp]- Add support for debian trixie(13) (devcontainers#1549)
* [cpp]- Add support for debian trixie(13) * variants change * removing bullseye
1 parent 28025a0 commit 754376b

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

src/cpp/.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=debian-12
1+
ARG VARIANT=debian-13
22
FROM mcr.microsoft.com/devcontainers/base:${VARIANT}
33
USER root
44

src/cpp/README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/cpp |
12-
| *Available image variants* | debian-12, debian-11, ubuntu-24.04, ubuntu-22.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `debian-11`, `ubuntu-24.04` and `ubuntu-22.04` variants |
12+
| *Available image variants* | debian-13, debian-12, ubuntu-24.04, ubuntu-22.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `ubuntu-24.04` and `ubuntu-22.04` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian, Ubuntu |
1616
| *Languages, platforms* | C++ |
@@ -23,21 +23,23 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2323

2424
- `mcr.microsoft.com/devcontainers/cpp` (latest Debian GA)
2525
- `mcr.microsoft.com/devcontainers/cpp:debian` (latest Debian GA)
26+
- `mcr.microsoft.com/devcontainers/cpp:debian-13` (or `trixie`)
2627
- `mcr.microsoft.com/devcontainers/cpp:debian-12` (or `bookworm`)
27-
- `mcr.microsoft.com/devcontainers/cpp:debian-11` (or `bullseye`)
2828
- `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
2929
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04` (or `noble`)
3030
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04` (or `jammy`)
3131

3232
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
3333

3434
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
35-
36-
- `mcr.microsoft.com/devcontainers/cpp:1-bookworm`
37-
- `mcr.microsoft.com/devcontainers/cpp:1.0-bookworm`
38-
- `mcr.microsoft.com/devcontainers/cpp:1.0.0-bookworm`
39-
40-
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-11`). 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.
35+
- `mcr.microsoft.com/devcontainers/cpp:2-trixie`
36+
- `mcr.microsoft.com/devcontainers/cpp:2.0-trixie`
37+
- `mcr.microsoft.com/devcontainers/cpp:2.0.0-trixie`
38+
- `mcr.microsoft.com/devcontainers/cpp:2-bookworm`
39+
- `mcr.microsoft.com/devcontainers/cpp:2.0-bookworm`
40+
- `mcr.microsoft.com/devcontainers/cpp:2.0.0-bookworm`
41+
42+
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.
4143

4244
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list).
4345

src/cpp/manifest.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"version": "1.2.14",
2+
"version": "2.0.0",
33
"variants": [
4+
"trixie",
45
"bookworm",
5-
"bullseye",
66
"noble",
77
"jammy"
88
],
99
"build": {
10-
"latest": "bookworm",
10+
"latest": "trixie",
1111
"parent": {
12+
"trixie": "base-debian",
1213
"bookworm": "base-debian",
13-
"bullseye": "base-debian",
1414
"noble": "base-ubuntu",
1515
"jammy": "base-ubuntu"
1616
},
1717
"rootDistro": "debian",
1818
"architectures": {
19-
"bookworm": [
19+
"trixie": [
2020
"linux/amd64",
2121
"linux/arm64"
2222
],
23-
"bullseye": [
23+
"bookworm": [
2424
"linux/amd64",
2525
"linux/arm64"
2626
],
@@ -37,16 +37,15 @@
3737
"cpp:${VERSION}-${VARIANT}"
3838
],
3939
"variantTags": {
40-
"bookworm": [
41-
"cpp:${VERSION}-debian-12",
42-
"cpp:${VERSION}-debian12",
40+
"trixie": [
41+
"cpp:${VERSION}-debian-13",
42+
"cpp:${VERSION}-debian13",
4343
"cpp:${VERSION}-debian",
4444
"cpp:${VERSION}"
4545
],
46-
"bullseye": [
47-
"cpp:${VERSION}-debian-11",
48-
"cpp:${VERSION}-debian11",
49-
"cpp:${VERSION}"
46+
"bookworm": [
47+
"cpp:${VERSION}-debian-12",
48+
"cpp:${VERSION}-debian12"
5049
],
5150
"noble": [
5251
"cpp:${VERSION}-ubuntu-24.04",

0 commit comments

Comments
 (0)