Skip to content

Commit 8a040d6

Browse files
MathiyarasyMathiyarasy
authored
Merge branch 'main' into dev/Mathi/UnivCondaBuildIssue
2 parents cf4de09 + 0bf522e commit 8a040d6

File tree

4 files changed

+38
-27
lines changed

4 files changed

+38
-27
lines changed

‎src/dotnet/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/dotnet |
12-
| *Available image variants* | 10.0-preview /10.0-preview-trixie, 9.0 /9.0-bookworm, 8.0 /8.0-bookworm, 10.0-preview-noble, 9.0-noble, 8.0-noble, 8.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
13-
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `trixie`, `bookworm`, `bullseye`, `noble`, `jammy` variants |
12+
| *Available image variants* | 10.0, 9.0 /9.0-bookworm, 8.0 /8.0-bookworm, 10.0-noble, 9.0-noble, 8.0-noble, 8.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) |
13+
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, `bullseye`, `noble`, `jammy` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
15-
| *Container OS* | Ubuntu (`-focal`, `-jammy`, `-noble`), Debian (`-trixie`, `-bullseye`, `-bookworm`) |
15+
| *Container OS* | Ubuntu (`-focal`, `-jammy`, `-noble`), Debian (`-bullseye`, `-bookworm`) |
1616
| *Languages, platforms* | .NET, .NET Core, C# |
1717

1818
See **[history](history)** for information on the contents of published images.
@@ -22,7 +22,7 @@ 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/dotnet` (latest)
25-
- `mcr.microsoft.com/devcontainers/dotnet:10.0-preview` (or `10.0-preview-trixie`, `10.0-preview-noble` to pin to an OS version)
25+
- `mcr.microsoft.com/devcontainers/dotnet:10.0` (or `10.0-noble` to pin to an OS version)
2626
- `mcr.microsoft.com/devcontainers/dotnet:9.0` (or `9.0-bookworm`, `9.0-noble` to pin to an OS version)
2727
- `mcr.microsoft.com/devcontainers/dotnet:8.0` (or `8.0-bookworm`, `8.0-noble`, `8.0-jammy` to pin to an OS version)
2828

‎src/dotnet/manifest.json‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"version": "1.5.4",
33
"variants": [
4-
"10.0-preview-trixie-slim",
5-
"10.0-preview-noble",
4+
"10.0-noble",
65
"9.0-bookworm-slim",
76
"9.0-noble",
87
"8.0-bookworm-slim",
@@ -16,11 +15,7 @@
1615
"dotnet:${VERSION}-${VARIANT}"
1716
],
1817
"architectures": {
19-
"10.0-preview-trixie-slim": [
20-
"linux/amd64",
21-
"linux/arm64"
22-
],
23-
"10.0-preview-noble": [
18+
"10.0-noble": [
2419
"linux/amd64",
2520
"linux/arm64"
2621
],
@@ -46,12 +41,9 @@
4641
]
4742
},
4843
"variantTags": {
49-
"10.0-preview-trixie-slim": [
50-
"dotnet:${VERSION}-10.0-preview-trixie"
51-
],
52-
"10.0-preview-noble": [
53-
"dotnet:${VERSION}-10.0-preview",
54-
"dotnet:${VERSION}-10.0-preview-noble"
44+
"10.0-noble": [
45+
"dotnet:${VERSION}-10.0",
46+
"dotnet:${VERSION}-10.0-noble"
5547
],
5648
"9.0-bookworm-slim": [
5749
"dotnet:${VERSION}-9.0",

‎src/python/README.md‎

Lines changed: 2 additions & 1 deletion
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-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)) |
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.14, 3.14-trixie, 3-bookworm, 3.9-bookworm, 3.10-bookworm, 3.11-bookworm, 3.12-bookworm, 3.13-bookworm, 3.14-bookworm, 3-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 3.12-bullseye, 3.13-bullseye, 3.14-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 |
@@ -29,6 +29,7 @@ You can directly reference [pre-built](https://containers.dev/implementors/refer
2929
- `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-trixie`, `3.11-bookworm`, `3.11-bullseye` to pin to an OS version)
3030
- `mcr.microsoft.com/devcontainers/python:3.12` (or `3.12-trixie`, `3.12-bookworm`, `3.12-bullseye` to pin to an OS version)
3131
- `mcr.microsoft.com/devcontainers/python:3.13` (or `3.13-trixie`, `3.13-bookworm`, `3.13-bullseye` to pin to an OS version)
32+
- `mcr.microsoft.com/devcontainers/python:3.14` (or `3.14-trixie`, `3.14-bookworm`, `3.14-bullseye` to pin to an OS version)
3233

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

‎src/python/manifest.json‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,33 @@
11
{
2-
"version": "2.0.2",
2+
"version": "2.1.0",
33
"variants": [
4+
"3.14-trixie",
45
"3.13-trixie",
56
"3.12-trixie",
67
"3.11-trixie",
78
"3.10-trixie",
8-
"3.9-trixie",
9+
"3.9-trixie",
10+
"3.14-bookworm",
911
"3.13-bookworm",
1012
"3.12-bookworm",
1113
"3.11-bookworm",
1214
"3.10-bookworm",
1315
"3.9-bookworm",
16+
"3.14-bullseye",
1417
"3.13-bullseye",
1518
"3.12-bullseye",
1619
"3.11-bullseye",
1720
"3.10-bullseye",
1821
"3.9-bullseye"
1922
],
2023
"build": {
21-
"latest": "3.13-trixie",
24+
"latest": "3.14-trixie",
2225
"rootDistro": "debian",
2326
"architectures": {
27+
"3.14-trixie": [
28+
"linux/amd64",
29+
"linux/arm64"
30+
],
2431
"3.13-trixie": [
2532
"linux/amd64",
2633
"linux/arm64"
@@ -40,7 +47,11 @@
4047
"3.9-trixie": [
4148
"linux/amd64",
4249
"linux/arm64"
43-
],
50+
],
51+
"3.14-bookworm": [
52+
"linux/amd64",
53+
"linux/arm64"
54+
],
4455
"3.13-bookworm": [
4556
"linux/amd64",
4657
"linux/arm64"
@@ -61,6 +72,10 @@
6172
"linux/amd64",
6273
"linux/arm64"
6374
],
75+
"3.14-bullseye": [
76+
"linux/amd64",
77+
"linux/arm64"
78+
],
6479
"3.13-bullseye": [
6580
"linux/amd64",
6681
"linux/arm64"
@@ -86,12 +101,15 @@
86101
"python:${VERSION}-${VARIANT}"
87102
],
88103
"variantTags": {
89-
"3.13-trixie": [
90-
"python:${VERSION}-3.13",
104+
"3.14-trixie": [
105+
"python:${VERSION}-3.14",
91106
"python:${VERSION}-3",
92107
"python:${VERSION}-3-trixie",
93108
"python:${VERSION}-trixie"
94-
],
109+
],
110+
"3.13-trixie": [
111+
"python:${VERSION}-3.13"
112+
],
95113
"3.12-trixie": [
96114
"python:${VERSION}-3.12"
97115
],
@@ -104,11 +122,11 @@
104122
"3.9-trixie": [
105123
"python:${VERSION}-3.9"
106124
],
107-
"3.13-bookworm": [
125+
"3.14-bookworm": [
108126
"python:${VERSION}-3-bookworm",
109127
"python:${VERSION}-bookworm"
110128
],
111-
"3.13-bullseye": [
129+
"3.14-bullseye": [
112130
"python:${VERSION}-3-bullseye",
113131
"python:${VERSION}-bullseye"
114132
]

0 commit comments

Comments
 (0)