Skip to content

Commit e5473dd

Browse files
Kaniska244Kaniska244
authored
Merge branch 'main' into universal-vulnerability-issues-fix
2 parents 8e9e61a + 777b69b commit e5473dd

File tree

9 files changed

+116
-60
lines changed

9 files changed

+116
-60
lines changed

‎src/go/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=1.25-bookworm
1+
ARG VARIANT=1.25-trixie
22
FROM golang:${VARIANT}
33

44
# Fixing vulnerability issue by upgrading svn to 1.14.5. Ref https://subversion.apache.org/security/CVE-2024-46901-advisory.txt

‎src/go/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
| *Categories* | Core, Languages |
1111
| *Definition type* | Dockerfile |
1212
| *Published images* | mcr.microsoft.com/devcontainers/go |
13-
| *Available image variants* | 1 / 1-bookworm, 1.25 / 1.25-bookworm, 1.24 / 1.24-bookworm, 1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
13+
| *Available image variants* | 1 / 1-bookworm, 1.25 / 1.25-trixie, 1.24 / 1.24-bookworm, 1-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/go/tags/list)) |
14+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm`, and `bullseye` variants |
1515
| *Container host OS support* | Linux, macOS, Windows |
1616
| *Container OS* | Debian |
1717
| *Languages, platforms* | Go |
@@ -23,19 +23,19 @@ See **[history](history)** for information on the contents of published images.
2323
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.
2424

2525
- `mcr.microsoft.com/devcontainers/go` (latest)
26-
- `mcr.microsoft.com/devcontainers/go:1` (or `1-bookworm`, `1-bullseye` to pin to an OS version)
27-
- `mcr.microsoft.com/devcontainers/go:1.25` (or `1.25-bookworm`, `1.25-bullseye` to pin to an OS version)
26+
- `mcr.microsoft.com/devcontainers/go:1` (or `1-trixie`, `1-bookworm`, `1-bullseye` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/go:1.25` (or `1.25-trixie`, `1.25-bookworm` to pin to an OS version)
2828
- `mcr.microsoft.com/devcontainers/go:1.24` (or `1.24-bookworm`, `1.24-bullseye` to pin to an OS version)
2929

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

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

34-
- `mcr.microsoft.com/devcontainers/go:1-1.25` (or `1-1.25-bookworm`, `1-1.25-bullseye`)
34+
- `mcr.microsoft.com/devcontainers/go:1-1.25` (or `1-1.25-trixie`, `1-1.25-bookworm`)
3535
- `mcr.microsoft.com/devcontainers/go:1.4-1.25` (or `1.4-1.25-bookworm`, `1.4-1.25-bullseye`)
3636
- `mcr.microsoft.com/devcontainers/go:1.4.0-1.25` (or `1.4.0-1.25-bookworm`, `1.4.0-1.25-bullseye`)
3737

38-
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. `1-1.24`). 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.
38+
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. `1-1.25`). 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.
3939

4040
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/go/tags/list).
4141

‎src/go/manifest.json‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
{
2-
"version": "1.4.6",
2+
"version": "2.0.0",
33
"variants": [
4+
"1.25-trixie",
5+
"1.24-trixie",
46
"1.25-bookworm",
57
"1.24-bookworm",
6-
"1.25-bullseye",
78
"1.24-bullseye"
89
],
910
"build": {
10-
"latest": "1.25-bookworm",
11+
"latest": "1.25-trixie",
1112
"rootDistro": "debian",
1213
"tags": [
1314
"go:${VERSION}-${VARIANT}"
1415
],
1516
"architectures": {
16-
"1.25-bookworm": [
17+
"1.25-trixie": [
1718
"linux/amd64",
1819
"linux/arm64"
1920
],
20-
"1.24-bookworm": [
21+
"1.24-trixie": [
2122
"linux/amd64",
2223
"linux/arm64"
2324
],
24-
"1.25-bullseye": [
25+
"1.25-bookworm": [
26+
"linux/amd64",
27+
"linux/arm64"
28+
],
29+
"1.24-bookworm": [
2530
"linux/amd64",
2631
"linux/arm64"
2732
],
@@ -31,21 +36,25 @@
3136
]
3237
},
3338
"variantTags": {
34-
"1.25-bookworm": [
39+
"1.25-trixie": [
3540
"go:${VERSION}-1.25",
3641
"go:${VERSION}-1",
37-
"go:${VERSION}-1-bookworm",
38-
"go:${VERSION}-bookworm"
42+
"go:${VERSION}-1-trixie",
43+
"go:${VERSION}-trixie"
3944
],
40-
"1.24-bookworm": [
45+
"1.24-trixie": [
4146
"go:${VERSION}-1.24",
4247
"go:${VERSION}-1",
48+
"go:${VERSION}-1-trixie",
49+
"go:${VERSION}-trixie"
50+
],
51+
"1.25-bookworm": [
4352
"go:${VERSION}-1-bookworm",
4453
"go:${VERSION}-bookworm"
4554
],
46-
"1.25-bullseye": [
47-
"go:${VERSION}-1-bullseye",
48-
"go:${VERSION}-bullseye"
55+
"1.24-bookworm": [
56+
"go:${VERSION}-1-bookworm",
57+
"go:${VERSION}-bookworm"
4958
],
5059
"1.24-bullseye": [
5160
"go:${VERSION}-1-bullseye",

‎src/javascript-node/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG VARIANT=24-bookworm
1+
ARG VARIANT=24-trixie
22
FROM node:${VARIANT}
33

44
ARG USERNAME=node

‎src/javascript-node/README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/javascript-node |
12-
| *Available image variants* | 24 / 24-bookworm, 22 / 22-bookworm, 20 / 20-bookworm, 24-bullseye, 22-bullseye, 20-bullseye, ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
12+
| *Available image variants* | 24 / 24-trixie, 22 / 22-trixie, 20 / 20-trixie, 24-bookworm, 22-bookworm, 20-bookworm, 24-bullseye, 22-bullseye, 20-bullseye, ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -20,19 +20,19 @@
2020
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.
2121

2222
- `mcr.microsoft.com/devcontainers/javascript-node` (latest)
23-
- `mcr.microsoft.com/devcontainers/javascript-node:24` (or `24-bookworm`, `24-bullseye` to pin to an OS version)
24-
- `mcr.microsoft.com/devcontainers/javascript-node:22` (or `22-bookworm`, `22-bullseye` to pin to an OS version)
25-
- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-bookworm`, `20-bullseye` to pin to an OS version)
23+
- `mcr.microsoft.com/devcontainers/javascript-node:24` (or `24-trixie`, `24-bookworm`, `24-bullseye` to pin to an OS version)
24+
- `mcr.microsoft.com/devcontainers/javascript-node:22` (or `22-trixie`, `22-bookworm`, `22-bullseye` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-trixie`, `20-bookworm`, `20-bullseye` to pin to an OS version)
2626

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

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

31-
- `mcr.microsoft.com/devcontainers/javascript-node:2-24` (or `2-24-bookworm`, `2-24-bullseye`)
32-
- `mcr.microsoft.com/devcontainers/javascript-node:2.0-24` (or `2.0-24-bookworm`, `2.0-24-bullseye`)
33-
- `mcr.microsoft.com/devcontainers/javascript-node:2.0.0-24` (or `2.0.0-24-bookworm`, `2.0.0-24-bullseye`)
31+
- `mcr.microsoft.com/devcontainers/javascript-node:4-24` (or `4-24-trixie`, `4-24-bookworm`, `4-24-bullseye`)
32+
- `mcr.microsoft.com/devcontainers/javascript-node:4.0-24` (or `4.0-24-trixie`, `4.0-24-bookworm`, `3.0-24-bullseye`)
33+
- `mcr.microsoft.com/devcontainers/javascript-node:4.0.0-24` (or `4.0.0-24-trixie`, `4.0.0-24-bookworm`, `4.0.0-24-bullseye`)
3434

35-
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. `2-24`). 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+
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. `4-24`). 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.
3636

3737
Beyond Node.js and `git`, this image / `Dockerfile` includes `eslint`, `zsh`, [Oh My Zsh!](https://ohmyz.sh/), a non-root `node` user with `sudo` access, and a set of common dependencies for development. [Node Version Manager](https://github.com/nvm-sh/nvm) (`nvm`) is also included in case you need to use a different version of Node.js than the one included in the image.
3838

‎src/javascript-node/manifest.json‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
2-
"version": "3.0.3",
2+
"version": "4.0.0",
33
"variants": [
4+
"24-trixie",
5+
"22-trixie",
6+
"20-trixie",
47
"24-bookworm",
58
"22-bookworm",
69
"20-bookworm",
@@ -9,9 +12,21 @@
912
"20-bullseye"
1013
],
1114
"build": {
12-
"latest": "24-bookworm",
15+
"latest": "24-trixie",
1316
"rootDistro": "debian",
1417
"architectures": {
18+
"24-trixie": [
19+
"linux/amd64",
20+
"linux/arm64"
21+
],
22+
"22-trixie": [
23+
"linux/amd64",
24+
"linux/arm64"
25+
],
26+
"20-trixie": [
27+
"linux/amd64",
28+
"linux/arm64"
29+
],
1530
"24-bookworm": [
1631
"linux/amd64",
1732
"linux/arm64"
@@ -41,15 +56,18 @@
4156
"javascript-node:${VERSION}-${VARIANT}"
4257
],
4358
"variantTags": {
44-
"24-bookworm": [
59+
"24-trixie": [
4560
"javascript-node:${VERSION}-24",
46-
"javascript-node:${VERSION}-bookworm"
61+
"javascript-node:${VERSION}-trixie"
4762
],
48-
"22-bookworm": [
63+
"22-trixie": [
4964
"javascript-node:${VERSION}-22"
5065
],
51-
"20-bookworm": [
66+
"20-trixie": [
5267
"javascript-node:${VERSION}-20"
68+
],
69+
"24-bookworm": [
70+
"javascript-node:${VERSION}-bookworm"
5371
],
5472
"24-bullseye": [
5573
"javascript-node:${VERSION}-bullseye"

‎src/python/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 3, 3.13, 3.12, 3.11, 3.10, 3.9, 3-bookworm, 3.13-bookworm, 3.12-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3-bullseye, 3.13-bullseye, 3.12-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3-buster, 3.12-buster, 3.11-buster, 3.10-buster, 3.9-buster
2-
ARG VARIANT=3-bookworm
2+
ARG VARIANT=3-trixie
33
FROM python:${VARIANT}
44

55
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

‎src/python/README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/python |
12-
| *Available image variants* | 3 / 3-bookworm, 3.9 / 3.9-bookworm, 3.10 / 3.10-bookworm, 3.11-bookworm / 3.11, 3.12-bookworm / 3.12, 3.13-bookworm / 3.13, 3-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 3.12-bullseye, 3.13-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) |
12+
| *Available image variants* | 3 / 3-trixie, 3.9 / 3.9-trixie, 3.10 / 3.10-trixie, 3.11-trixie / 3.11, 3.12-trixie / 3.12, 3.13-trixie / 3.13, 3-bookworm, 3.9-bookworm, 3.10-bookworm, 3.11-bookworm, 3.12-bookworm, 3.13-bookworm, 3-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 3.12-bullseye, 3.13-bullseye ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants |
1414
| *Container Host OS Support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -24,21 +24,21 @@ See **[history](history)** for information on the contents of published images.
2424
You can directly reference [pre-built](https://containers.dev/implementors/reference/#prebuilding) versions of this image by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` with one of the following:
2525

2626
- `mcr.microsoft.com/devcontainers/python:3` (latest)
27-
- `mcr.microsoft.com/devcontainers/python:3.9` (or `3.9-bookworm`, `3.9-bullseye` to pin to an OS version)
28-
- `mcr.microsoft.com/devcontainers/python:3.10` (or `3.10-bookworm`, `3.10-bullseye` to pin to an OS version)
29-
- `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-bookworm`, `3.11-bullseye` to pin to an OS version)
30-
- `mcr.microsoft.com/devcontainers/python:3.12` (or `3.12-bookworm`, `3.12-bullseye` to pin to an OS version)
31-
- `mcr.microsoft.com/devcontainers/python:3.13` (or `3.13-bookworm`, `3.13-bullseye` to pin to an OS version)
27+
- `mcr.microsoft.com/devcontainers/python:3.9` (or `3.9-trixie`, `3.9-bookworm`, `3.9-bullseye` to pin to an OS version)
28+
- `mcr.microsoft.com/devcontainers/python:3.10` (or `3.10-trixie`, `3.10-bookworm`, `3.10-bullseye` to pin to an OS version)
29+
- `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-trixie`, `3.11-bookworm`, `3.11-bullseye` to pin to an OS version)
30+
- `mcr.microsoft.com/devcontainers/python:3.12` (or `3.12-trixie`, `3.12-bookworm`, `3.12-bullseye` to pin to an OS version)
31+
- `mcr.microsoft.com/devcontainers/python:3.13` (or `3.13-trixie`, `3.13-bookworm`, `3.13-bullseye` to pin to an OS version)
3232

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

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

37-
- `mcr.microsoft.com/devcontainers/python:1-3.9` (or `1-3.9-bullseye`)
38-
- `mcr.microsoft.com/devcontainers/python:1.0-3.9` (or `1.0-3.9-bullseye`)
39-
- `mcr.microsoft.com/devcontainers/python:1.0.0-3.9` (or `1.0.0-3.9-bullseye`)
37+
- `mcr.microsoft.com/devcontainers/python:2-3.13` (or `2-3.13-bullseye`)
38+
- `mcr.microsoft.com/devcontainers/python:2.0-3.13` (or `2.0-3.13-bullseye`)
39+
- `mcr.microsoft.com/devcontainers/python:2.0.0-3.13` (or `2.0.0-3.13-bullseye`)
4040

41-
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. `1-3`).
41+
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. `2-3`).
4242
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

4444
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/python/tags/list).

‎src/python/manifest.json‎

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
2-
"version": "1.3.1",
2+
"version": "2.0.0",
33
"variants": [
4+
"3.13-trixie",
5+
"3.12-trixie",
6+
"3.11-trixie",
7+
"3.10-trixie",
8+
"3.9-trixie",
49
"3.13-bookworm",
510
"3.12-bookworm",
611
"3.11-bookworm",
@@ -13,9 +18,29 @@
1318
"3.9-bullseye"
1419
],
1520
"build": {
16-
"latest": "3.13-bookworm",
21+
"latest": "3.13-trixie",
1722
"rootDistro": "debian",
1823
"architectures": {
24+
"3.13-trixie": [
25+
"linux/amd64",
26+
"linux/arm64"
27+
],
28+
"3.12-trixie": [
29+
"linux/amd64",
30+
"linux/arm64"
31+
],
32+
"3.11-trixie": [
33+
"linux/amd64",
34+
"linux/arm64"
35+
],
36+
"3.10-trixie": [
37+
"linux/amd64",
38+
"linux/arm64"
39+
],
40+
"3.9-trixie": [
41+
"linux/amd64",
42+
"linux/arm64"
43+
],
1944
"3.13-bookworm": [
2045
"linux/amd64",
2146
"linux/arm64"
@@ -61,24 +86,28 @@
6186
"python:${VERSION}-${VARIANT}"
6287
],
6388
"variantTags": {
64-
"3.13-bookworm": [
89+
"3.13-trixie": [
6590
"python:${VERSION}-3.13",
6691
"python:${VERSION}-3",
67-
"python:${VERSION}-3-bookworm",
68-
"python:${VERSION}-bookworm"
69-
],
70-
"3.12-bookworm": [
92+
"python:${VERSION}-3-trixie",
93+
"python:${VERSION}-trixie"
94+
],
95+
"3.12-trixie": [
7196
"python:${VERSION}-3.12"
72-
],
73-
"3.11-bookworm": [
97+
],
98+
"3.11-trixie": [
7499
"python:${VERSION}-3.11"
75-
],
76-
"3.10-bookworm": [
100+
],
101+
"3.10-trixie": [
77102
"python:${VERSION}-3.10"
78-
],
79-
"3.9-bookworm": [
103+
],
104+
"3.9-trixie": [
80105
"python:${VERSION}-3.9"
81-
],
106+
],
107+
"3.13-bookworm": [
108+
"python:${VERSION}-3-bookworm",
109+
"python:${VERSION}-bookworm"
110+
],
82111
"3.13-bullseye": [
83112
"python:${VERSION}-3-bullseye",
84113
"python:${VERSION}-bullseye"

0 commit comments

Comments
 (0)