Skip to content

Commit 92a034a

Browse files
Kaniska244Kaniska244
authored
Dev container - Image Naming convention changes (#1630)
* Dev container - Image Naming convention changes * Updating readme files. * cpp image changes
1 parent 84a5cfc commit 92a034a

File tree

9 files changed

+35
-45
lines changed

9 files changed

+35
-45
lines changed

‎src/base-alpine/README.md‎

Lines changed: 8 additions & 8 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:alpine |
12-
| *Available image variants* | alpine-3.22, alpine-3.21, alpine-3.20, alpine-3.19 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
12+
| *Available image variants* | alpine3.22, alpine3.21, alpine3.20, alpine3.19 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Alpine Linux |
@@ -22,19 +22,19 @@ See **[history](history)** for information on the contents of published images.
2222
You can also directly reference pre-built versions of `.devcontainer/Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
2323

2424
- `mcr.microsoft.com/devcontainers/base:alpine` (latest)
25-
- `mcr.microsoft.com/devcontainers/base:alpine-3.22`
26-
- `mcr.microsoft.com/devcontainers/base:alpine-3.21`
27-
- `mcr.microsoft.com/devcontainers/base:alpine-3.20`
28-
- `mcr.microsoft.com/devcontainers/base:alpine-3.19`
25+
- `mcr.microsoft.com/devcontainers/base:alpine3.22`
26+
- `mcr.microsoft.com/devcontainers/base:alpine3.21`
27+
- `mcr.microsoft.com/devcontainers/base:alpine3.20`
28+
- `mcr.microsoft.com/devcontainers/base:alpine3.19`
2929

3030

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

3333
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3434

35-
- `mcr.microsoft.com/devcontainers/base:0-alpine`
36-
- `mcr.microsoft.com/devcontainers/base:0.209-alpine`
37-
- `mcr.microsoft.com/devcontainers/base:0.209.0-alpine`
35+
- `mcr.microsoft.com/devcontainers/base:1-alpine`
36+
- `mcr.microsoft.com/devcontainers/base:1.1-alpine`
37+
- `mcr.microsoft.com/devcontainers/base:1.1.0-alpine`
3838

3939
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/base/tags/list).
4040

‎src/base-alpine/manifest.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.2",
2+
"version": "1.1.0",
33
"variants": [
44
"3.22",
55
"3.21",
@@ -14,7 +14,6 @@
1414
"linux/arm64"
1515
],
1616
"tags": [
17-
"base:${VERSION}-alpine-${VARIANT}",
1817
"base:${VERSION}-alpine${VARIANT}"
1918
],
2019
"variantTags": {

‎src/base-debian/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ See **[history](history)** for information on the contents of published images.
2222
You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
2323

2424
- `mcr.microsoft.com/devcontainers/base:debian` (latest)
25-
- `mcr.microsoft.com/devcontainers/base:trixie` (or `debian-13`)
26-
- `mcr.microsoft.com/devcontainers/base:bookworm` (or `debian-12`)
27-
- `mcr.microsoft.com/devcontainers/base:bullseye` (or `debian-11`)
25+
- `mcr.microsoft.com/devcontainers/base:trixie` (or `debian13`)
26+
- `mcr.microsoft.com/devcontainers/base:bookworm` (or `debian12`)
27+
- `mcr.microsoft.com/devcontainers/base:bullseye` (or `debian11`)
2828

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

3131
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3232

33-
- `mcr.microsoft.com/devcontainers/base:1-trixie`
34-
- `mcr.microsoft.com/devcontainers/base:1.0-trixie`
35-
- `mcr.microsoft.com/devcontainers/base:1.0.0-trixie`
33+
- `mcr.microsoft.com/devcontainers/base:2-trixie`
34+
- `mcr.microsoft.com/devcontainers/base:2.1-trixie`
35+
- `mcr.microsoft.com/devcontainers/base:2.1.0-trixie`
3636

3737
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/base/tags/list).
3838

‎src/base-debian/manifest.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.2",
2+
"version": "2.1.0",
33
"variants": [
44
"trixie",
55
"bookworm",
@@ -27,17 +27,14 @@
2727
],
2828
"variantTags": {
2929
"trixie": [
30-
"base:${VERSION}-debian-13",
3130
"base:${VERSION}-debian13",
3231
"base:${VERSION}-debian",
3332
"base:${VERSION}"
3433
],
3534
"bookworm": [
36-
"base:${VERSION}-debian-12",
3735
"base:${VERSION}-debian12"
3836
],
3937
"bullseye": [
40-
"base:${VERSION}-debian-11",
4138
"base:${VERSION}-debian11"
4239
]
4340
}

‎src/base-ubuntu/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
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 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `ubuntu-22.04` (`jammy`) and `ubuntu-24.04` (`noble`) variants |
12+
| *Available image variants* | ubuntu24.04 / noble, ubuntu22.04 / jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `ubuntu22.04` (`jammy`) and `ubuntu24.04` (`noble`) variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Ubuntu |
1616
| *Languages, platforms* | Any |
@@ -22,16 +22,16 @@ See **[history](history)** for information on the contents of published images.
2222
You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository.
2323

2424
- `mcr.microsoft.com/devcontainers/base:ubuntu` (latest LTS release)
25-
- `mcr.microsoft.com/devcontainers/base:ubuntu-24.04` (or `noble`)
26-
- `mcr.microsoft.com/devcontainers/base:ubuntu-22.04` (or `jammy`)
25+
- `mcr.microsoft.com/devcontainers/base:ubuntu24.04` (or `noble`)
26+
- `mcr.microsoft.com/devcontainers/base:ubuntu22.04` (or `jammy`)
2727

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

3030
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3131

3232
- `mcr.microsoft.com/devcontainers/base:2-jammy`
33-
- `mcr.microsoft.com/devcontainers/base:2.0-jammy`
34-
- `mcr.microsoft.com/devcontainers/base:2.0.0-jammy`
33+
- `mcr.microsoft.com/devcontainers/base:2.1-jammy`
34+
- `mcr.microsoft.com/devcontainers/base:2.1.0-jammy`
3535

3636
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/base/tags/list).
3737

‎src/base-ubuntu/manifest.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.5",
2+
"version": "2.1.0",
33
"variants": [
44
"noble",
55
"jammy"
@@ -22,12 +22,10 @@
2222
],
2323
"variantTags": {
2424
"noble": [
25-
"base:${VERSION}-ubuntu-24.04",
2625
"base:${VERSION}-ubuntu24.04",
2726
"base:${VERSION}-ubuntu"
2827
],
2928
"jammy": [
30-
"base:${VERSION}-ubuntu-22.04",
3129
"base:${VERSION}-ubuntu22.04"
3230
]
3331
}

‎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-13
1+
ARG VARIANT=debian13
22
FROM mcr.microsoft.com/devcontainers/base:${VARIANT}
33
USER root
44

‎src/cpp/README.md‎

Lines changed: 10 additions & 10 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-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 |
12+
| *Available image variants* | debian13, debian12, ubuntu24.04, ubuntu22.04 ([full list](https://mcr.microsoft.com/v2/devcontainers/cpp/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, aarch64/arm64 for `debian13`, `debian12`, `ubuntu24.04` and `ubuntu22.04` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian, Ubuntu |
1616
| *Languages, platforms* | C++ |
@@ -23,21 +23,21 @@ 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`)
27-
- `mcr.microsoft.com/devcontainers/cpp:debian-12` (or `bookworm`)
26+
- `mcr.microsoft.com/devcontainers/cpp:debian13` (or `trixie`)
27+
- `mcr.microsoft.com/devcontainers/cpp:debian12` (or `bookworm`)
2828
- `mcr.microsoft.com/devcontainers/cpp:ubuntu` (latest Ubuntu LTS)
29-
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-24.04` (or `noble`)
30-
- `mcr.microsoft.com/devcontainers/cpp:ubuntu-22.04` (or `jammy`)
29+
- `mcr.microsoft.com/devcontainers/cpp:ubuntu24.04` (or `noble`)
30+
- `mcr.microsoft.com/devcontainers/cpp:ubuntu22.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:
3535
- `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`
36+
- `mcr.microsoft.com/devcontainers/cpp:2.1-trixie`
37+
- `mcr.microsoft.com/devcontainers/cpp:2.1.0-trixie`
3838
- `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`
39+
- `mcr.microsoft.com/devcontainers/cpp:2.1-bookworm`
40+
- `mcr.microsoft.com/devcontainers/cpp:2.1.0-bookworm`
4141

4242
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.
4343

‎src/cpp/manifest.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.0.1",
2+
"version": "2.1.0",
33
"variants": [
44
"trixie",
55
"bookworm",
@@ -38,22 +38,18 @@
3838
],
3939
"variantTags": {
4040
"trixie": [
41-
"cpp:${VERSION}-debian-13",
4241
"cpp:${VERSION}-debian13",
4342
"cpp:${VERSION}-debian",
4443
"cpp:${VERSION}"
4544
],
4645
"bookworm": [
47-
"cpp:${VERSION}-debian-12",
4846
"cpp:${VERSION}-debian12"
4947
],
5048
"noble": [
51-
"cpp:${VERSION}-ubuntu-24.04",
5249
"cpp:${VERSION}-ubuntu24.04",
5350
"cpp:${VERSION}-ubuntu"
5451
],
5552
"jammy": [
56-
"cpp:${VERSION}-ubuntu-22.04",
5753
"cpp:${VERSION}-ubuntu22.04"
5854
]
5955
}

0 commit comments

Comments
 (0)