Skip to content

Commit 3ac07b9

Browse files
authored
[cpp] - Ubuntu focal EOL for c++ image (#1416)
* Ubuntu focal EOL for c++ image * Removing version bump
1 parent 146b194 commit 3ac07b9

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

src/cpp/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
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, ubuntu-20.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
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)) |
1313
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian-12`, `debian-11`, `ubuntu-24.04` and `ubuntu-22.04` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian, Ubuntu |
@@ -28,7 +28,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
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`)
31-
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-20.04` (or `focal`)
3231

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

src/cpp/manifest.json

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
"bookworm",
55
"bullseye",
66
"noble",
7-
"jammy",
8-
"focal"
7+
"jammy"
98
],
109
"build": {
1110
"latest": "bookworm",
1211
"parent": {
1312
"bookworm": "base-debian",
1413
"bullseye": "base-debian",
1514
"noble": "base-ubuntu",
16-
"jammy": "base-ubuntu",
17-
"focal": "base-ubuntu"
15+
"jammy": "base-ubuntu"
1816
},
1917
"rootDistro": "debian",
2018
"architectures": {
@@ -33,9 +31,6 @@
3331
"jammy": [
3432
"linux/amd64",
3533
"linux/arm64"
36-
],
37-
"focal": [
38-
"linux/amd64"
3934
]
4035
},
4136
"tags": [
@@ -55,16 +50,12 @@
5550
],
5651
"noble": [
5752
"cpp:${VERSION}-ubuntu-24.04",
58-
"cpp:${VERSION}-ubuntu24.04"
53+
"cpp:${VERSION}-ubuntu24.04",
54+
"cpp:${VERSION}-ubuntu"
5955
],
6056
"jammy": [
6157
"cpp:${VERSION}-ubuntu-22.04",
6258
"cpp:${VERSION}-ubuntu22.04"
63-
],
64-
"focal": [
65-
"cpp:${VERSION}-ubuntu-20.04",
66-
"cpp:${VERSION}-ubuntu20.04",
67-
"cpp:${VERSION}-ubuntu"
6859
]
6960
}
7061
},

0 commit comments

Comments
 (0)