Skip to content

Commit 33be05e

Browse files
authored
[base-ubuntu] - Ubuntu focal EOL for base image (devcontainers#1415)
* Ubuntu focal EOL for base image * Removing version bump
1 parent 3ac07b9 commit 33be05e

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

src/base-ubuntu/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:ubuntu |
12-
| *Available image variants* | ubuntu-24.04 / noble, ubuntu-22.04 / jammy, ubuntu-20.04 / focal ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
12+
| *Available image variants* | ubuntu-24.04 / noble, ubuntu-22.04 / jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `ubuntu-22.04` (`jammy`) and `ubuntu-24.04` (`noble`) variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Ubuntu |
@@ -24,7 +24,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2424
- `mcr.microsoft.com/devcontainers/base:ubuntu` (latest LTS release)
2525
- `mcr.microsoft.com/devcontainers/base:ubuntu-24.04` (or `noble`)
2626
- `mcr.microsoft.com/devcontainers/base:ubuntu-22.04` (or `jammy`)
27-
- `mcr.microsoft.com/devcontainers/base:ubuntu-20.04` (or `focal`)
2827

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

src/base-ubuntu/manifest.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"version": "1.2.6",
33
"variants": [
44
"noble",
5-
"jammy",
6-
"focal"
5+
"jammy"
76
],
87
"build": {
98
"latest": false,
@@ -16,9 +15,6 @@
1615
"jammy": [
1716
"linux/amd64",
1817
"linux/arm64"
19-
],
20-
"focal": [
21-
"linux/amd64"
2218
]
2319
},
2420
"tags": [
@@ -27,16 +23,12 @@
2723
"variantTags": {
2824
"noble": [
2925
"base:${VERSION}-ubuntu-24.04",
30-
"base:${VERSION}-ubuntu24.04"
26+
"base:${VERSION}-ubuntu24.04",
27+
"base:${VERSION}-ubuntu"
3128
],
3229
"jammy": [
3330
"base:${VERSION}-ubuntu-22.04",
34-
"base:${VERSION}-ubuntu22.04",
35-
"base:${VERSION}-ubuntu"
36-
],
37-
"focal": [
38-
"base:${VERSION}-ubuntu-20.04",
39-
"base:${VERSION}-ubuntu20.04"
31+
"base:${VERSION}-ubuntu22.04"
4032
]
4133
}
4234
},

0 commit comments

Comments
 (0)