diff --git a/src/python/.devcontainer/Dockerfile b/src/python/.devcontainer/Dockerfile index 680c9767e8..ae8bacf5c6 100644 --- a/src/python/.devcontainer/Dockerfile +++ b/src/python/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -# [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 3, 3.11, 3.10, 3.9, 3.8, 3-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3.8-bookworm, 3-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3-buster, 3.11-buster, 3.10-buster, 3.9-buster, 3.8-buster +# [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 3, 3.12, 3.11, 3.10, 3.9, 3.8, 3-bookworm, 3.12-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3.8-bookworm, 3-bullseye, 3.12-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye, 3-buster, 3.12-buster, 3.11-buster, 3.10-buster, 3.9-buster, 3.8-buster ARG VARIANT=3-bookworm FROM python:${VARIANT} diff --git a/src/python/README.md b/src/python/README.md index 1e9341aa15..16dbb18e7d 100644 --- a/src/python/README.md +++ b/src/python/README.md @@ -9,7 +9,7 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published image* | mcr.microsoft.com/devcontainers/python | -| *Available image variants* | 3 / 3-bookworm, 3.8 / 3.8-bookworm, 3.9 / 3.9-bookworm, 3.10 / 3.10-bookworm, 3.11-bookworm, 3.11, 3-bullseye, 3.8-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 3.8-buster, 3.9-buster, 3.10-buster, 3.11-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) | +| *Available image variants* | 3 / 3-bookworm, 3.8 / 3.8-bookworm, 3.9 / 3.9-bookworm, 3.10 / 3.10-bookworm, 3.11-bookworm / 3.11, 3.12-bookworm / 3.12, 3-bullseye, 3.8-bullseye, 3.9-bullseye, 3.10-bullseye, 3.11-bullseye, 12-bullseye, 3.8-buster, 3.9-buster, 3.10-buster, 3.11-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/python/tags/list)) | | *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, and `bullseye` variants | | *Container Host OS Support* | Linux, macOS, Windows | | *Container OS* | Debian | @@ -28,6 +28,7 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag - `mcr.microsoft.com/devcontainers/python:3.9` (or `3.9-bookworm`, `3.9-bullseye`, `3.9-buster` to pin to an OS version) - `mcr.microsoft.com/devcontainers/python:3.10` (or `3.10-bookworm`, `3.10-bullseye`, `3.10-buster` to pin to an OS version) - `mcr.microsoft.com/devcontainers/python:3.11` (or `3.11-bookworm`, `3.11-bullseye`, `3.11-buster` to pin to an OS version) +- `mcr.microsoft.com/devcontainers/python:3.12` (or `3.12-bookworm`, `3.12-bullseye`, `3.12-buster` to pin to an OS version) Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. diff --git a/src/python/manifest.json b/src/python/manifest.json index ef9c2a7630..987b8a8706 100644 --- a/src/python/manifest.json +++ b/src/python/manifest.json @@ -1,23 +1,30 @@ { "version": "1.0.3", "variants": [ + "3.12-bookworm", "3.11-bookworm", "3.10-bookworm", "3.9-bookworm", "3.8-bookworm", + "3.12-bullseye", "3.11-bullseye", "3.10-bullseye", "3.9-bullseye", "3.8-bullseye", + "3.12-buster", "3.11-buster", "3.10-buster", "3.9-buster", "3.8-buster" ], "build": { - "latest": "3.11-bookworm", + "latest": "3.12-bookworm", "rootDistro": "debian", "architectures": { + "3.12-bookworm": [ + "linux/amd64", + "linux/arm64" + ], "3.11-bookworm": [ "linux/amd64", "linux/arm64" @@ -34,6 +41,10 @@ "linux/amd64", "linux/arm64" ], + "3.12-bullseye": [ + "linux/amd64", + "linux/arm64" + ], "3.11-bullseye": [ "linux/amd64", "linux/arm64" @@ -50,6 +61,9 @@ "linux/amd64", "linux/arm64" ], + "3.12-buster": [ + "linux/amd64" + ], "3.11-buster": [ "linux/amd64" ], @@ -67,12 +81,15 @@ "python:${VERSION}-${VARIANT}" ], "variantTags": { - "3.11-bookworm": [ - "python:${VERSION}-3.11", + "3.12-bookworm": [ + "python:${VERSION}-3.12", "python:${VERSION}-3", "python:${VERSION}-3-bookworm", "python:${VERSION}-bookworm" ], + "3.11-bookworm": [ + "python:${VERSION}-3.11" + ], "3.10-bookworm": [ "python:${VERSION}-3.10" ], @@ -82,11 +99,11 @@ "3.8-bookworm": [ "python:${VERSION}-3.8" ], - "3.11-bullseye": [ + "3.12-bullseye": [ "python:${VERSION}-3-bullseye", "python:${VERSION}-bullseye" ], - "3.11-buster": [ + "3.12-buster": [ "python:${VERSION}-3-buster", "python:${VERSION}-buster" ]