Skip to content

Commit 02580ea

Browse files
Kaniska244AlvaroRausell
Kaniska244
and
AlvaroRausell
authored
[python] - Add support for debian trixie(13) (#1513)
* [python] - Add support for debian trixie(13) * Furthe changes in readme file. * Corrections in variantTags --------- Co-authored-by: Álvaro Rausell Guiard <33221237+AlvaroRausell@users.noreply.github.com>
1 parent fc1bac7 commit 02580ea

File tree

3 files changed

+54
-25
lines changed

3 files changed

+54
-25
lines changed

‎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)