From 34416dc8978516e1aee327d2c1a4ca2b6e871bc2 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 14 Jan 2026 14:49:33 -0800 Subject: [PATCH 01/10] Update 3.15-rc to 3.15.0a5 --- 3.15-rc/alpine3.22/Dockerfile | 4 ++-- 3.15-rc/alpine3.23/Dockerfile | 4 ++-- 3.15-rc/bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-trixie/Dockerfile | 4 ++-- 3.15-rc/trixie/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.22/Dockerfile index bbe0fcd7c..08bd41af6 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.22/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/alpine3.23/Dockerfile b/3.15-rc/alpine3.23/Dockerfile index 2a0554abc..caf03e5ed 100644 --- a/3.15-rc/alpine3.23/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/bookworm/Dockerfile b/3.15-rc/bookworm/Dockerfile index 3644f088a..160973db9 100644 --- a/3.15-rc/bookworm/Dockerfile +++ b/3.15-rc/bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/slim-bookworm/Dockerfile b/3.15-rc/slim-bookworm/Dockerfile index a4eaa188c..650dd8fd6 100644 --- a/3.15-rc/slim-bookworm/Dockerfile +++ b/3.15-rc/slim-bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/slim-trixie/Dockerfile b/3.15-rc/slim-trixie/Dockerfile index 53a772fe8..604993d1a 100644 --- a/3.15-rc/slim-trixie/Dockerfile +++ b/3.15-rc/slim-trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/trixie/Dockerfile b/3.15-rc/trixie/Dockerfile index 9f797c004..6a1e063f7 100644 --- a/3.15-rc/trixie/Dockerfile +++ b/3.15-rc/trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef RUN set -eux; \ \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile index 0c83a80eb..677fdf8d6 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 4dff016067a5e4888fb49666750f0f1a71f4924e4bc41abe66bd2e966f7fc9d3 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile index 824f564ab..a9d0bdda6 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a4 -ENV PYTHON_SHA256 4dff016067a5e4888fb49666750f0f1a71f4924e4bc41abe66bd2e966f7fc9d3 +ENV PYTHON_VERSION 3.15.0a5 +ENV PYTHON_SHA256 9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/versions.json b/versions.json index 2143f76a6..5732a154c 100644 --- a/versions.json +++ b/versions.json @@ -98,10 +98,10 @@ "3.15-rc": { "checksums": { "source": { - "sha256": "a0a521d5c480b89979da1aefce29750eb158128c0178728ebfef7511c21b4e77" + "sha256": "fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef" }, "windows": { - "sha256": "4dff016067a5e4888fb49666750f0f1a71f4924e4bc41abe66bd2e966f7fc9d3" + "sha256": "9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9" } }, "variants": [ @@ -114,6 +114,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "3.15.0a4" + "version": "3.15.0a5" } } From 37025e2ac6c3410c66ec98655af86623d5c0407e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 20 Jan 2026 11:48:12 -0800 Subject: [PATCH 02/10] Fix indentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our architecture-detection `case` statement was indented too far. 😂 --- 3.12/alpine3.22/Dockerfile | 32 +++++++++++++-------------- 3.12/alpine3.23/Dockerfile | 32 +++++++++++++-------------- 3.12/bookworm/Dockerfile | 32 +++++++++++++-------------- 3.12/slim-bookworm/Dockerfile | 32 +++++++++++++-------------- 3.12/slim-trixie/Dockerfile | 32 +++++++++++++-------------- 3.12/trixie/Dockerfile | 32 +++++++++++++-------------- 3.13/alpine3.22/Dockerfile | 32 +++++++++++++-------------- 3.13/alpine3.23/Dockerfile | 32 +++++++++++++-------------- 3.13/bookworm/Dockerfile | 32 +++++++++++++-------------- 3.13/slim-bookworm/Dockerfile | 32 +++++++++++++-------------- 3.13/slim-trixie/Dockerfile | 32 +++++++++++++-------------- 3.13/trixie/Dockerfile | 32 +++++++++++++-------------- 3.14/alpine3.22/Dockerfile | 32 +++++++++++++-------------- 3.14/alpine3.23/Dockerfile | 32 +++++++++++++-------------- 3.14/bookworm/Dockerfile | 32 +++++++++++++-------------- 3.14/slim-bookworm/Dockerfile | 32 +++++++++++++-------------- 3.14/slim-trixie/Dockerfile | 32 +++++++++++++-------------- 3.14/trixie/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/alpine3.22/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/alpine3.23/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/bookworm/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/slim-bookworm/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/slim-trixie/Dockerfile | 32 +++++++++++++-------------- 3.15-rc/trixie/Dockerfile | 32 +++++++++++++-------------- Dockerfile-linux.template | 38 ++++++++++++++++---------------- 25 files changed, 403 insertions(+), 403 deletions(-) diff --git a/3.12/alpine3.22/Dockerfile b/3.12/alpine3.22/Dockerfile index 3d5f9a26d..58d18cbc8 100644 --- a/3.12/alpine3.22/Dockerfile +++ b/3.12/alpine3.22/Dockerfile @@ -83,24 +83,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.12/alpine3.23/Dockerfile b/3.12/alpine3.23/Dockerfile index 5ed1166d5..115a5af3c 100644 --- a/3.12/alpine3.23/Dockerfile +++ b/3.12/alpine3.23/Dockerfile @@ -83,24 +83,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile index 5f51a938b..a8444968f 100644 --- a/3.12/bookworm/Dockerfile +++ b/3.12/bookworm/Dockerfile @@ -56,24 +56,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile index 28ea81d7e..4f86beb7c 100644 --- a/3.12/slim-bookworm/Dockerfile +++ b/3.12/slim-bookworm/Dockerfile @@ -82,24 +82,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.12/slim-trixie/Dockerfile b/3.12/slim-trixie/Dockerfile index f473b4619..306fb08e9 100644 --- a/3.12/slim-trixie/Dockerfile +++ b/3.12/slim-trixie/Dockerfile @@ -82,24 +82,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.12/trixie/Dockerfile b/3.12/trixie/Dockerfile index c384b1a45..48eff8df3 100644 --- a/3.12/trixie/Dockerfile +++ b/3.12/trixie/Dockerfile @@ -56,24 +56,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/alpine3.22/Dockerfile b/3.13/alpine3.22/Dockerfile index b3cc60e8b..2756eb6dc 100644 --- a/3.13/alpine3.22/Dockerfile +++ b/3.13/alpine3.22/Dockerfile @@ -78,24 +78,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/alpine3.23/Dockerfile b/3.13/alpine3.23/Dockerfile index 98e9509df..59c202fdf 100644 --- a/3.13/alpine3.23/Dockerfile +++ b/3.13/alpine3.23/Dockerfile @@ -78,24 +78,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/bookworm/Dockerfile b/3.13/bookworm/Dockerfile index 2f928339a..d1493a1d2 100644 --- a/3.13/bookworm/Dockerfile +++ b/3.13/bookworm/Dockerfile @@ -51,24 +51,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/slim-bookworm/Dockerfile b/3.13/slim-bookworm/Dockerfile index cce4a3fe2..ae47d0453 100644 --- a/3.13/slim-bookworm/Dockerfile +++ b/3.13/slim-bookworm/Dockerfile @@ -77,24 +77,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/slim-trixie/Dockerfile b/3.13/slim-trixie/Dockerfile index 216acae54..e8d443e03 100644 --- a/3.13/slim-trixie/Dockerfile +++ b/3.13/slim-trixie/Dockerfile @@ -77,24 +77,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.13/trixie/Dockerfile b/3.13/trixie/Dockerfile index 8dabd54bc..1ad9ffc2a 100644 --- a/3.13/trixie/Dockerfile +++ b/3.13/trixie/Dockerfile @@ -51,24 +51,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/alpine3.22/Dockerfile b/3.14/alpine3.22/Dockerfile index e8afd6eff..407a18c09 100644 --- a/3.14/alpine3.22/Dockerfile +++ b/3.14/alpine3.22/Dockerfile @@ -72,24 +72,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/alpine3.23/Dockerfile b/3.14/alpine3.23/Dockerfile index 9d3f7fd66..1e3a7afd6 100644 --- a/3.14/alpine3.23/Dockerfile +++ b/3.14/alpine3.23/Dockerfile @@ -72,24 +72,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/bookworm/Dockerfile b/3.14/bookworm/Dockerfile index 122347de9..16995692d 100644 --- a/3.14/bookworm/Dockerfile +++ b/3.14/bookworm/Dockerfile @@ -50,24 +50,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/slim-bookworm/Dockerfile b/3.14/slim-bookworm/Dockerfile index 391b65792..9faa2fb5c 100644 --- a/3.14/slim-bookworm/Dockerfile +++ b/3.14/slim-bookworm/Dockerfile @@ -71,24 +71,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/slim-trixie/Dockerfile b/3.14/slim-trixie/Dockerfile index 820d32355..95ad66bdf 100644 --- a/3.14/slim-trixie/Dockerfile +++ b/3.14/slim-trixie/Dockerfile @@ -71,24 +71,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.14/trixie/Dockerfile b/3.14/trixie/Dockerfile index 901ee09be..e70450270 100644 --- a/3.14/trixie/Dockerfile +++ b/3.14/trixie/Dockerfile @@ -50,24 +50,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.22/Dockerfile index 08bd41af6..1b10a6e60 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.22/Dockerfile @@ -72,24 +72,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/alpine3.23/Dockerfile b/3.15-rc/alpine3.23/Dockerfile index caf03e5ed..e66f8dd6c 100644 --- a/3.15-rc/alpine3.23/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -72,24 +72,24 @@ RUN set -eux; \ # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - x86_64|aarch64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - x86) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + x86_64|aarch64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + x86) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/bookworm/Dockerfile b/3.15-rc/bookworm/Dockerfile index 160973db9..18abaf936 100644 --- a/3.15-rc/bookworm/Dockerfile +++ b/3.15-rc/bookworm/Dockerfile @@ -50,24 +50,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/slim-bookworm/Dockerfile b/3.15-rc/slim-bookworm/Dockerfile index 650dd8fd6..6bc6b2d9a 100644 --- a/3.15-rc/slim-bookworm/Dockerfile +++ b/3.15-rc/slim-bookworm/Dockerfile @@ -71,24 +71,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/slim-trixie/Dockerfile b/3.15-rc/slim-trixie/Dockerfile index 604993d1a..ee1a2ec86 100644 --- a/3.15-rc/slim-trixie/Dockerfile +++ b/3.15-rc/slim-trixie/Dockerfile @@ -71,24 +71,24 @@ RUN set -eux; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/3.15-rc/trixie/Dockerfile b/3.15-rc/trixie/Dockerfile index 6a1e063f7..6e3435f52 100644 --- a/3.15-rc/trixie/Dockerfile +++ b/3.15-rc/trixie/Dockerfile @@ -50,24 +50,24 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ - amd64|arm64) \ - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ - i386) \ - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + case "$arch" in \ + amd64|arm64) \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ + i386) \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 0810a4ed0..3e4b54cfa 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -224,35 +224,35 @@ RUN set -eux; \ if rcVersion | IN("3.10", "3.11") then "" else ( -}} {{ if is_alpine then ( -}} - arch="$(apk --print-arch)"; \ + arch="$(apk --print-arch)"; \ {{ ) else ( -}} - arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ + arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ {{ ) end -}} # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 - case "$arch" in \ + case "$arch" in \ {{ if is_alpine then ( -}} - x86_64|aarch64) \ + x86_64|aarch64) \ {{ ) else ( -}} - amd64|arm64) \ + amd64|arm64) \ {{ ) end -}} - # only add "-mno-omit-leaf" on arches that support it - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 - # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ - ;; \ + # only add "-mno-omit-leaf" on arches that support it + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/x86-Options.html#index-momit-leaf-frame-pointer-2 + # https://gcc.gnu.org/onlinedocs/gcc-14.2.0/gcc/AArch64-Options.html#index-momit-leaf-frame-pointer + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"; \ + ;; \ {{ if is_alpine then ( -}} - x86) \ + x86) \ {{ ) else ( -}} - i386) \ + i386) \ {{ ) end -}} - # don't enable frame-pointers on 32bit x86 due to performance drop. - ;; \ - *) \ - # other arches don't support "-mno-omit-leaf" - EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ - ;; \ - esac; \ + # don't enable frame-pointers on 32bit x86 due to performance drop. + ;; \ + *) \ + # other arches don't support "-mno-omit-leaf" + EXTRA_CFLAGS="${EXTRA_CFLAGS:-} -fno-omit-frame-pointer"; \ + ;; \ + esac; \ {{ ) end -}} make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ From 90e9ca41dc404ee7d22c09b894823e8925227c17 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 20 Jan 2026 11:24:46 -0800 Subject: [PATCH 03/10] Use more defensive `LDFLAGS` append method In Debian Trixie and older, `dpkg-buildflags --get LDFLAGS` returns something like `-Wl,-z-relro` and in Forky and newer it looks like `-Wl,-z-relro -fcf-protection`, so instead of relying on that `-Wl` and appending to the existing value, we can (and should) just add new `-Wl` values to the end, which _should_ be combined together correctly by the compiler/linker. --- 3.10/alpine3.22/Dockerfile | 4 ++-- 3.10/alpine3.23/Dockerfile | 4 ++-- 3.10/bookworm/Dockerfile | 2 +- 3.10/slim-bookworm/Dockerfile | 4 ++-- 3.10/slim-trixie/Dockerfile | 4 ++-- 3.10/trixie/Dockerfile | 2 +- 3.11/alpine3.22/Dockerfile | 4 ++-- 3.11/alpine3.23/Dockerfile | 4 ++-- 3.11/bookworm/Dockerfile | 2 +- 3.11/slim-bookworm/Dockerfile | 4 ++-- 3.11/slim-trixie/Dockerfile | 4 ++-- 3.11/trixie/Dockerfile | 2 +- 3.12/alpine3.22/Dockerfile | 4 ++-- 3.12/alpine3.23/Dockerfile | 4 ++-- 3.12/bookworm/Dockerfile | 2 +- 3.12/slim-bookworm/Dockerfile | 4 ++-- 3.12/slim-trixie/Dockerfile | 4 ++-- 3.12/trixie/Dockerfile | 2 +- 3.13/alpine3.22/Dockerfile | 4 ++-- 3.13/alpine3.23/Dockerfile | 4 ++-- 3.13/bookworm/Dockerfile | 2 +- 3.13/slim-bookworm/Dockerfile | 4 ++-- 3.13/slim-trixie/Dockerfile | 4 ++-- 3.13/trixie/Dockerfile | 2 +- 3.14/alpine3.22/Dockerfile | 4 ++-- 3.14/alpine3.23/Dockerfile | 4 ++-- 3.14/bookworm/Dockerfile | 2 +- 3.14/slim-bookworm/Dockerfile | 4 ++-- 3.14/slim-trixie/Dockerfile | 4 ++-- 3.14/trixie/Dockerfile | 2 +- 3.15-rc/alpine3.22/Dockerfile | 4 ++-- 3.15-rc/alpine3.23/Dockerfile | 4 ++-- 3.15-rc/bookworm/Dockerfile | 2 +- 3.15-rc/slim-bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-trixie/Dockerfile | 4 ++-- 3.15-rc/trixie/Dockerfile | 2 +- Dockerfile-linux.template | 4 ++-- 37 files changed, 62 insertions(+), 62 deletions(-) diff --git a/3.10/alpine3.22/Dockerfile b/3.10/alpine3.22/Dockerfile index 9d8817fb7..36c6bc92e 100644 --- a/3.10/alpine3.22/Dockerfile +++ b/3.10/alpine3.22/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -92,7 +92,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.10/alpine3.23/Dockerfile b/3.10/alpine3.23/Dockerfile index bbde97a6f..c38dc49a3 100644 --- a/3.10/alpine3.23/Dockerfile +++ b/3.10/alpine3.23/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -92,7 +92,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile index 5d4e0db90..b9879f453 100644 --- a/3.10/bookworm/Dockerfile +++ b/3.10/bookworm/Dockerfile @@ -65,7 +65,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile index 9fac25174..e380e755a 100644 --- a/3.10/slim-bookworm/Dockerfile +++ b/3.10/slim-bookworm/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -91,7 +91,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.10/slim-trixie/Dockerfile b/3.10/slim-trixie/Dockerfile index 9c27605a7..54f9a5e59 100644 --- a/3.10/slim-trixie/Dockerfile +++ b/3.10/slim-trixie/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -91,7 +91,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.10/trixie/Dockerfile b/3.10/trixie/Dockerfile index a0b09dab9..d39e2857e 100644 --- a/3.10/trixie/Dockerfile +++ b/3.10/trixie/Dockerfile @@ -65,7 +65,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/alpine3.22/Dockerfile b/3.11/alpine3.22/Dockerfile index a88b9e328..e580e4efb 100644 --- a/3.11/alpine3.22/Dockerfile +++ b/3.11/alpine3.22/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -92,7 +92,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/alpine3.23/Dockerfile b/3.11/alpine3.23/Dockerfile index 095e792f4..a83dd2e4d 100644 --- a/3.11/alpine3.23/Dockerfile +++ b/3.11/alpine3.23/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -92,7 +92,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/bookworm/Dockerfile b/3.11/bookworm/Dockerfile index 6b9158d70..a02baff26 100644 --- a/3.11/bookworm/Dockerfile +++ b/3.11/bookworm/Dockerfile @@ -65,7 +65,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/slim-bookworm/Dockerfile b/3.11/slim-bookworm/Dockerfile index 9137579df..c979c6419 100644 --- a/3.11/slim-bookworm/Dockerfile +++ b/3.11/slim-bookworm/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -91,7 +91,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/slim-trixie/Dockerfile b/3.11/slim-trixie/Dockerfile index 43add477a..6d346528c 100644 --- a/3.11/slim-trixie/Dockerfile +++ b/3.11/slim-trixie/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ "LDFLAGS=${LDFLAGS:-}" \ @@ -91,7 +91,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.11/trixie/Dockerfile b/3.11/trixie/Dockerfile index 4daf9651d..d9c93cb21 100644 --- a/3.11/trixie/Dockerfile +++ b/3.11/trixie/Dockerfile @@ -65,7 +65,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/alpine3.22/Dockerfile b/3.12/alpine3.22/Dockerfile index 58d18cbc8..278eac91e 100644 --- a/3.12/alpine3.22/Dockerfile +++ b/3.12/alpine3.22/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -110,7 +110,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/alpine3.23/Dockerfile b/3.12/alpine3.23/Dockerfile index 115a5af3c..571036dfb 100644 --- a/3.12/alpine3.23/Dockerfile +++ b/3.12/alpine3.23/Dockerfile @@ -82,7 +82,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -110,7 +110,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile index a8444968f..904b2b946 100644 --- a/3.12/bookworm/Dockerfile +++ b/3.12/bookworm/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile index 4f86beb7c..c8debe41a 100644 --- a/3.12/slim-bookworm/Dockerfile +++ b/3.12/slim-bookworm/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -109,7 +109,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/slim-trixie/Dockerfile b/3.12/slim-trixie/Dockerfile index 306fb08e9..b9ff939e4 100644 --- a/3.12/slim-trixie/Dockerfile +++ b/3.12/slim-trixie/Dockerfile @@ -81,7 +81,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -109,7 +109,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.12/trixie/Dockerfile b/3.12/trixie/Dockerfile index 48eff8df3..d2b592bae 100644 --- a/3.12/trixie/Dockerfile +++ b/3.12/trixie/Dockerfile @@ -83,7 +83,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/alpine3.22/Dockerfile b/3.13/alpine3.22/Dockerfile index 2756eb6dc..5f4e534c5 100644 --- a/3.13/alpine3.22/Dockerfile +++ b/3.13/alpine3.22/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -105,7 +105,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/alpine3.23/Dockerfile b/3.13/alpine3.23/Dockerfile index 59c202fdf..88e61ae92 100644 --- a/3.13/alpine3.23/Dockerfile +++ b/3.13/alpine3.23/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -105,7 +105,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/bookworm/Dockerfile b/3.13/bookworm/Dockerfile index d1493a1d2..ec3a15967 100644 --- a/3.13/bookworm/Dockerfile +++ b/3.13/bookworm/Dockerfile @@ -78,7 +78,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/slim-bookworm/Dockerfile b/3.13/slim-bookworm/Dockerfile index ae47d0453..046a2d7e1 100644 --- a/3.13/slim-bookworm/Dockerfile +++ b/3.13/slim-bookworm/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -104,7 +104,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/slim-trixie/Dockerfile b/3.13/slim-trixie/Dockerfile index e8d443e03..aeb98251f 100644 --- a/3.13/slim-trixie/Dockerfile +++ b/3.13/slim-trixie/Dockerfile @@ -76,7 +76,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -104,7 +104,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.13/trixie/Dockerfile b/3.13/trixie/Dockerfile index 1ad9ffc2a..cf709d74d 100644 --- a/3.13/trixie/Dockerfile +++ b/3.13/trixie/Dockerfile @@ -78,7 +78,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/alpine3.22/Dockerfile b/3.14/alpine3.22/Dockerfile index 407a18c09..e32939bfd 100644 --- a/3.14/alpine3.22/Dockerfile +++ b/3.14/alpine3.22/Dockerfile @@ -71,7 +71,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -99,7 +99,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/alpine3.23/Dockerfile b/3.14/alpine3.23/Dockerfile index 1e3a7afd6..b2d530afc 100644 --- a/3.14/alpine3.23/Dockerfile +++ b/3.14/alpine3.23/Dockerfile @@ -71,7 +71,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -99,7 +99,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/bookworm/Dockerfile b/3.14/bookworm/Dockerfile index 16995692d..4c3b74a15 100644 --- a/3.14/bookworm/Dockerfile +++ b/3.14/bookworm/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/slim-bookworm/Dockerfile b/3.14/slim-bookworm/Dockerfile index 9faa2fb5c..c957d0906 100644 --- a/3.14/slim-bookworm/Dockerfile +++ b/3.14/slim-bookworm/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -98,7 +98,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/slim-trixie/Dockerfile b/3.14/slim-trixie/Dockerfile index 95ad66bdf..552a9e64b 100644 --- a/3.14/slim-trixie/Dockerfile +++ b/3.14/slim-trixie/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -98,7 +98,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.14/trixie/Dockerfile b/3.14/trixie/Dockerfile index e70450270..b10f61355 100644 --- a/3.14/trixie/Dockerfile +++ b/3.14/trixie/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.22/Dockerfile index 1b10a6e60..379607cbc 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.22/Dockerfile @@ -71,7 +71,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -99,7 +99,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/alpine3.23/Dockerfile b/3.15-rc/alpine3.23/Dockerfile index e66f8dd6c..29770b3a7 100644 --- a/3.15-rc/alpine3.23/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -71,7 +71,7 @@ RUN set -eux; \ # set thread stack size to 1MB so we don't segfault before we hit sys.getrecursionlimit() # https://github.com/alpinelinux/aports/commit/2026e1259422d4e0cf92391ca2d3844356c649d0 EXTRA_CFLAGS="-DTHREAD_STACK_SIZE=0x100000"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(apk --print-arch)"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -99,7 +99,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/bookworm/Dockerfile b/3.15-rc/bookworm/Dockerfile index 18abaf936..7be6c0497 100644 --- a/3.15-rc/bookworm/Dockerfile +++ b/3.15-rc/bookworm/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/slim-bookworm/Dockerfile b/3.15-rc/slim-bookworm/Dockerfile index 6bc6b2d9a..c9750daec 100644 --- a/3.15-rc/slim-bookworm/Dockerfile +++ b/3.15-rc/slim-bookworm/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -98,7 +98,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/slim-trixie/Dockerfile b/3.15-rc/slim-trixie/Dockerfile index ee1a2ec86..8243a5ffe 100644 --- a/3.15-rc/slim-trixie/Dockerfile +++ b/3.15-rc/slim-trixie/Dockerfile @@ -70,7 +70,7 @@ RUN set -eux; \ nproc="$(nproc)"; \ EXTRA_CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ arch="$(dpkg --print-architecture)"; arch="${arch##*-}"; \ # https://docs.python.org/3.12/howto/perf_profiling.html # https://github.com/docker-library/python/pull/1000#issuecomment-2597021615 @@ -98,7 +98,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/3.15-rc/trixie/Dockerfile b/3.15-rc/trixie/Dockerfile index 6e3435f52..e83cdde1e 100644 --- a/3.15-rc/trixie/Dockerfile +++ b/3.15-rc/trixie/Dockerfile @@ -77,7 +77,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index 3e4b54cfa..92cc4f2b5 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -217,7 +217,7 @@ RUN set -eux; \ LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \ {{ ) end -}} {{ if is_slim or is_alpine then ( -}} - LDFLAGS="${LDFLAGS:--Wl},--strip-all"; \ + LDFLAGS="${LDFLAGS:-} -Wl,--strip-all"; \ {{ ) else "" end -}} {{ # Enabling frame-pointers only makes sense for Python 3.12 and newer as those have perf profiler support @@ -263,7 +263,7 @@ RUN set -eux; \ rm python; \ make -j "$nproc" \ "EXTRA_CFLAGS=${EXTRA_CFLAGS:-}" \ - "LDFLAGS=${LDFLAGS:--Wl},-rpath='\$\$ORIGIN/../lib'" \ + "LDFLAGS=${LDFLAGS:-} -Wl,-rpath='\$\$ORIGIN/../lib'" \ python \ ; \ make install; \ From d7d46d97a9ffd58269d8d1d0218ce959362b4298 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Feb 2026 14:49:25 -0800 Subject: [PATCH 04/10] Update 3.13 to 3.13.12 --- 3.13/alpine3.22/Dockerfile | 4 ++-- 3.13/alpine3.23/Dockerfile | 4 ++-- 3.13/bookworm/Dockerfile | 4 ++-- 3.13/slim-bookworm/Dockerfile | 4 ++-- 3.13/slim-trixie/Dockerfile | 4 ++-- 3.13/trixie/Dockerfile | 4 ++-- 3.13/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 3.13/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/3.13/alpine3.22/Dockerfile b/3.13/alpine3.22/Dockerfile index 5f4e534c5..46edc2a72 100644 --- a/3.13/alpine3.22/Dockerfile +++ b/3.13/alpine3.22/Dockerfile @@ -17,8 +17,8 @@ RUN set -eux; \ ; ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/alpine3.23/Dockerfile b/3.13/alpine3.23/Dockerfile index 88e61ae92..e345da2a5 100644 --- a/3.13/alpine3.23/Dockerfile +++ b/3.13/alpine3.23/Dockerfile @@ -17,8 +17,8 @@ RUN set -eux; \ ; ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/bookworm/Dockerfile b/3.13/bookworm/Dockerfile index ec3a15967..8af9bc3f2 100644 --- a/3.13/bookworm/Dockerfile +++ b/3.13/bookworm/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/slim-bookworm/Dockerfile b/3.13/slim-bookworm/Dockerfile index 046a2d7e1..a591d854d 100644 --- a/3.13/slim-bookworm/Dockerfile +++ b/3.13/slim-bookworm/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/slim-trixie/Dockerfile b/3.13/slim-trixie/Dockerfile index aeb98251f..ed91c73d6 100644 --- a/3.13/slim-trixie/Dockerfile +++ b/3.13/slim-trixie/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/trixie/Dockerfile b/3.13/trixie/Dockerfile index cf709d74d..abd88f85c 100644 --- a/3.13/trixie/Dockerfile +++ b/3.13/trixie/Dockerfile @@ -20,8 +20,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593 RUN set -eux; \ \ diff --git a/3.13/windows/windowsservercore-ltsc2022/Dockerfile b/3.13/windows/windowsservercore-ltsc2022/Dockerfile index b21f0b99b..683afe3c0 100644 --- a/3.13/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.13/windows/windowsservercore-ltsc2022/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 30d4654b3eac7ddfdf2682db4c8dcb490f3055f4f33c6906d6b828f680152101 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 96159fcb523ae404b707186a75b4104ee23851e476a5e838e14584cf1e03f981 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/3.13/windows/windowsservercore-ltsc2025/Dockerfile b/3.13/windows/windowsservercore-ltsc2025/Dockerfile index 2aa90e2b0..6df4dd864 100644 --- a/3.13/windows/windowsservercore-ltsc2025/Dockerfile +++ b/3.13/windows/windowsservercore-ltsc2025/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.13.11 -ENV PYTHON_SHA256 30d4654b3eac7ddfdf2682db4c8dcb490f3055f4f33c6906d6b828f680152101 +ENV PYTHON_VERSION 3.13.12 +ENV PYTHON_SHA256 96159fcb523ae404b707186a75b4104ee23851e476a5e838e14584cf1e03f981 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/versions.json b/versions.json index 5732a154c..315a9bf92 100644 --- a/versions.json +++ b/versions.json @@ -56,10 +56,10 @@ "3.13": { "checksums": { "source": { - "sha256": "16ede7bb7cdbfa895d11b0642fa0e523f291e6487194d53cf6d3b338c3a17ea2" + "sha256": "2a84cd31dd8d8ea8aaff75de66fc1b4b0127dd5799aa50a64ae9a313885b4593" }, "windows": { - "sha256": "30d4654b3eac7ddfdf2682db4c8dcb490f3055f4f33c6906d6b828f680152101" + "sha256": "96159fcb523ae404b707186a75b4104ee23851e476a5e838e14584cf1e03f981" } }, "variants": [ @@ -72,7 +72,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "3.13.11" + "version": "3.13.12" }, "3.14": { "checksums": { From ce782e2435387d50d3a21a29c76d0eb4115057d3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Feb 2026 16:46:51 -0800 Subject: [PATCH 05/10] Update 3.14 to 3.14.3 --- 3.14/alpine3.22/Dockerfile | 4 ++-- 3.14/alpine3.23/Dockerfile | 4 ++-- 3.14/bookworm/Dockerfile | 4 ++-- 3.14/slim-bookworm/Dockerfile | 4 ++-- 3.14/slim-trixie/Dockerfile | 4 ++-- 3.14/trixie/Dockerfile | 4 ++-- 3.14/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 3.14/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/3.14/alpine3.22/Dockerfile b/3.14/alpine3.22/Dockerfile index e32939bfd..0c83b4535 100644 --- a/3.14/alpine3.22/Dockerfile +++ b/3.14/alpine3.22/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/alpine3.23/Dockerfile b/3.14/alpine3.23/Dockerfile index b2d530afc..739e4aa89 100644 --- a/3.14/alpine3.23/Dockerfile +++ b/3.14/alpine3.23/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/bookworm/Dockerfile b/3.14/bookworm/Dockerfile index 4c3b74a15..030ac52be 100644 --- a/3.14/bookworm/Dockerfile +++ b/3.14/bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/slim-bookworm/Dockerfile b/3.14/slim-bookworm/Dockerfile index c957d0906..dd2dbb6bf 100644 --- a/3.14/slim-bookworm/Dockerfile +++ b/3.14/slim-bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/slim-trixie/Dockerfile b/3.14/slim-trixie/Dockerfile index 552a9e64b..d9f37d851 100644 --- a/3.14/slim-trixie/Dockerfile +++ b/3.14/slim-trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/trixie/Dockerfile b/3.14/trixie/Dockerfile index b10f61355..3771a8dce 100644 --- a/3.14/trixie/Dockerfile +++ b/3.14/trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b RUN set -eux; \ \ diff --git a/3.14/windows/windowsservercore-ltsc2022/Dockerfile b/3.14/windows/windowsservercore-ltsc2022/Dockerfile index a5c7b7cfd..0bbda7710 100644 --- a/3.14/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.14/windows/windowsservercore-ltsc2022/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 9db919cefe30a0051658c600a9912acb0cd2b872aaf35842c9ec2bf401efa848 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 b68ad91421afbbd1a628105199c8c5f6179b21ba799067a8d8c0bbac3b7defb0 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/3.14/windows/windowsservercore-ltsc2025/Dockerfile b/3.14/windows/windowsservercore-ltsc2025/Dockerfile index b663e4c99..ba13e8ef0 100644 --- a/3.14/windows/windowsservercore-ltsc2025/Dockerfile +++ b/3.14/windows/windowsservercore-ltsc2025/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.14.2 -ENV PYTHON_SHA256 9db919cefe30a0051658c600a9912acb0cd2b872aaf35842c9ec2bf401efa848 +ENV PYTHON_VERSION 3.14.3 +ENV PYTHON_SHA256 b68ad91421afbbd1a628105199c8c5f6179b21ba799067a8d8c0bbac3b7defb0 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/versions.json b/versions.json index 315a9bf92..22097ecb0 100644 --- a/versions.json +++ b/versions.json @@ -77,10 +77,10 @@ "3.14": { "checksums": { "source": { - "sha256": "ce543ab854bc256b61b71e9b27f831ffd1bfd60a479d639f8be7f9757cf573e9" + "sha256": "a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b" }, "windows": { - "sha256": "9db919cefe30a0051658c600a9912acb0cd2b872aaf35842c9ec2bf401efa848" + "sha256": "b68ad91421afbbd1a628105199c8c5f6179b21ba799067a8d8c0bbac3b7defb0" } }, "variants": [ @@ -93,7 +93,7 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "3.14.2" + "version": "3.14.3" }, "3.15-rc": { "checksums": { From 719683e893c4b63cd9133d4c12ae33790ac1abec Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 11 Feb 2026 08:49:31 -0800 Subject: [PATCH 06/10] Update 3.15-rc to 3.15.0a6 --- 3.15-rc/alpine3.22/Dockerfile | 4 ++-- 3.15-rc/alpine3.23/Dockerfile | 4 ++-- 3.15-rc/bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-trixie/Dockerfile | 4 ++-- 3.15-rc/trixie/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.22/Dockerfile index 379607cbc..9a41b3ee7 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.22/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/alpine3.23/Dockerfile b/3.15-rc/alpine3.23/Dockerfile index 29770b3a7..fd7b8883f 100644 --- a/3.15-rc/alpine3.23/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/bookworm/Dockerfile b/3.15-rc/bookworm/Dockerfile index 7be6c0497..7bf819c77 100644 --- a/3.15-rc/bookworm/Dockerfile +++ b/3.15-rc/bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/slim-bookworm/Dockerfile b/3.15-rc/slim-bookworm/Dockerfile index c9750daec..8a8505095 100644 --- a/3.15-rc/slim-bookworm/Dockerfile +++ b/3.15-rc/slim-bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/slim-trixie/Dockerfile b/3.15-rc/slim-trixie/Dockerfile index 8243a5ffe..9a60b4574 100644 --- a/3.15-rc/slim-trixie/Dockerfile +++ b/3.15-rc/slim-trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/trixie/Dockerfile b/3.15-rc/trixie/Dockerfile index e83cdde1e..785689ee1 100644 --- a/3.15-rc/trixie/Dockerfile +++ b/3.15-rc/trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 RUN set -eux; \ \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile index 677fdf8d6..a67adc5ac 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9 +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile index a9d0bdda6..0643097a6 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a5 -ENV PYTHON_SHA256 9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9 +ENV PYTHON_VERSION 3.15.0a6 +ENV PYTHON_SHA256 6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/versions.json b/versions.json index 22097ecb0..14b8ba590 100644 --- a/versions.json +++ b/versions.json @@ -98,10 +98,10 @@ "3.15-rc": { "checksums": { "source": { - "sha256": "fee40da6450b67547c079dcb2852e8a03db6d57e06415466b2d3294449db22ef" + "sha256": "8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989" }, "windows": { - "sha256": "9cf3a702a049e3b8da1d05fc733415c6839f2c142d59ba1f5e89aa3c6520c2a9" + "sha256": "6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3" } }, "variants": [ @@ -114,6 +114,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "3.15.0a5" + "version": "3.15.0a6" } } From e4727fdefd2cd6f2713e67ddc8f18ad7027245a3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 2 Mar 2026 18:49:11 -0800 Subject: [PATCH 07/10] Update 3.10 to 3.10.20 --- 3.10/alpine3.22/Dockerfile | 4 ++-- 3.10/alpine3.23/Dockerfile | 4 ++-- 3.10/bookworm/Dockerfile | 4 ++-- 3.10/slim-bookworm/Dockerfile | 4 ++-- 3.10/slim-trixie/Dockerfile | 4 ++-- 3.10/trixie/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.10/alpine3.22/Dockerfile b/3.10/alpine3.22/Dockerfile index 36c6bc92e..e3be8f98a 100644 --- a/3.10/alpine3.22/Dockerfile +++ b/3.10/alpine3.22/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/3.10/alpine3.23/Dockerfile b/3.10/alpine3.23/Dockerfile index c38dc49a3..79b0e3ec2 100644 --- a/3.10/alpine3.23/Dockerfile +++ b/3.10/alpine3.23/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/3.10/bookworm/Dockerfile b/3.10/bookworm/Dockerfile index b9879f453..63792f437 100644 --- a/3.10/bookworm/Dockerfile +++ b/3.10/bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/3.10/slim-bookworm/Dockerfile b/3.10/slim-bookworm/Dockerfile index e380e755a..bd2968c14 100644 --- a/3.10/slim-bookworm/Dockerfile +++ b/3.10/slim-bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/3.10/slim-trixie/Dockerfile b/3.10/slim-trixie/Dockerfile index 54f9a5e59..f4c7fbb07 100644 --- a/3.10/slim-trixie/Dockerfile +++ b/3.10/slim-trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/3.10/trixie/Dockerfile b/3.10/trixie/Dockerfile index d39e2857e..edb9616d9 100644 --- a/3.10/trixie/Dockerfile +++ b/3.10/trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.10.19 -ENV PYTHON_SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076 +ENV PYTHON_VERSION 3.10.20 +ENV PYTHON_SHA256 de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505 RUN set -eux; \ \ diff --git a/versions.json b/versions.json index 14b8ba590..a5ad72873 100644 --- a/versions.json +++ b/versions.json @@ -2,7 +2,7 @@ "3.10": { "checksums": { "source": { - "sha256": "c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076" + "sha256": "de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505" } }, "setuptools": { @@ -16,7 +16,7 @@ "alpine3.23", "alpine3.22" ], - "version": "3.10.19" + "version": "3.10.20" }, "3.11": { "checksums": { From c859f2b9e567f72c94e00c969f916d3f92ae52a7 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Mon, 2 Mar 2026 20:21:44 -0800 Subject: [PATCH 08/10] Update 3.11 to 3.11.15 --- 3.11/alpine3.22/Dockerfile | 4 ++-- 3.11/alpine3.23/Dockerfile | 4 ++-- 3.11/bookworm/Dockerfile | 4 ++-- 3.11/slim-bookworm/Dockerfile | 4 ++-- 3.11/slim-trixie/Dockerfile | 4 ++-- 3.11/trixie/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.11/alpine3.22/Dockerfile b/3.11/alpine3.22/Dockerfile index e580e4efb..d43ba24b8 100644 --- a/3.11/alpine3.22/Dockerfile +++ b/3.11/alpine3.22/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/3.11/alpine3.23/Dockerfile b/3.11/alpine3.23/Dockerfile index a83dd2e4d..9a4d0c7ad 100644 --- a/3.11/alpine3.23/Dockerfile +++ b/3.11/alpine3.23/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/3.11/bookworm/Dockerfile b/3.11/bookworm/Dockerfile index a02baff26..2968b791e 100644 --- a/3.11/bookworm/Dockerfile +++ b/3.11/bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/3.11/slim-bookworm/Dockerfile b/3.11/slim-bookworm/Dockerfile index c979c6419..db4b9d00b 100644 --- a/3.11/slim-bookworm/Dockerfile +++ b/3.11/slim-bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/3.11/slim-trixie/Dockerfile b/3.11/slim-trixie/Dockerfile index 6d346528c..2a24cfdf4 100644 --- a/3.11/slim-trixie/Dockerfile +++ b/3.11/slim-trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/3.11/trixie/Dockerfile b/3.11/trixie/Dockerfile index d9c93cb21..efd749b62 100644 --- a/3.11/trixie/Dockerfile +++ b/3.11/trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY A035C8C19219BA821ECEA86B64E628F8D684696D -ENV PYTHON_VERSION 3.11.14 -ENV PYTHON_SHA256 8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78 +ENV PYTHON_VERSION 3.11.15 +ENV PYTHON_SHA256 272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625 RUN set -eux; \ \ diff --git a/versions.json b/versions.json index a5ad72873..7594dfb12 100644 --- a/versions.json +++ b/versions.json @@ -21,7 +21,7 @@ "3.11": { "checksums": { "source": { - "sha256": "8d3ed8ec5c88c1c95f5e558612a725450d2452813ddad5e58fdb1a53b1209b78" + "sha256": "272179ddd9a2e41a0fc8e42e33dfbdca0b3711aa5abf372d3f2d51543d09b625" } }, "setuptools": { @@ -35,7 +35,7 @@ "alpine3.23", "alpine3.22" ], - "version": "3.11.14" + "version": "3.11.15" }, "3.12": { "checksums": { From 3362634339580d3232e65a66dd5a36c47ae7ff14 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 3 Mar 2026 06:49:17 -0800 Subject: [PATCH 09/10] Update 3.12 to 3.12.13 --- 3.12/alpine3.22/Dockerfile | 4 ++-- 3.12/alpine3.23/Dockerfile | 4 ++-- 3.12/bookworm/Dockerfile | 4 ++-- 3.12/slim-bookworm/Dockerfile | 4 ++-- 3.12/slim-trixie/Dockerfile | 4 ++-- 3.12/trixie/Dockerfile | 4 ++-- versions.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/3.12/alpine3.22/Dockerfile b/3.12/alpine3.22/Dockerfile index 278eac91e..37c814fee 100644 --- a/3.12/alpine3.22/Dockerfile +++ b/3.12/alpine3.22/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/3.12/alpine3.23/Dockerfile b/3.12/alpine3.23/Dockerfile index 571036dfb..91342ac4d 100644 --- a/3.12/alpine3.23/Dockerfile +++ b/3.12/alpine3.23/Dockerfile @@ -22,8 +22,8 @@ RUN set -eux; \ ; ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/3.12/bookworm/Dockerfile b/3.12/bookworm/Dockerfile index 904b2b946..e84b5f8af 100644 --- a/3.12/bookworm/Dockerfile +++ b/3.12/bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/3.12/slim-bookworm/Dockerfile b/3.12/slim-bookworm/Dockerfile index c8debe41a..7039a72d5 100644 --- a/3.12/slim-bookworm/Dockerfile +++ b/3.12/slim-bookworm/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/3.12/slim-trixie/Dockerfile b/3.12/slim-trixie/Dockerfile index b9ff939e4..e9c8ec000 100644 --- a/3.12/slim-trixie/Dockerfile +++ b/3.12/slim-trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/3.12/trixie/Dockerfile b/3.12/trixie/Dockerfile index d2b592bae..683a96eb4 100644 --- a/3.12/trixie/Dockerfile +++ b/3.12/trixie/Dockerfile @@ -25,8 +25,8 @@ RUN set -eux; \ apt-get dist-clean ENV GPG_KEY 7169605F62C751356D054A26A821E680E5FA6305 -ENV PYTHON_VERSION 3.12.12 -ENV PYTHON_SHA256 fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4 +ENV PYTHON_VERSION 3.12.13 +ENV PYTHON_SHA256 c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684 RUN set -eux; \ \ diff --git a/versions.json b/versions.json index 7594dfb12..53bcfac81 100644 --- a/versions.json +++ b/versions.json @@ -40,7 +40,7 @@ "3.12": { "checksums": { "source": { - "sha256": "fb85a13414b028c49ba18bbd523c2d055a30b56b18b92ce454ea2c51edc656c4" + "sha256": "c08bc65a81971c1dd5783182826503369466c7e67374d1646519adf05207b684" } }, "variants": [ @@ -51,7 +51,7 @@ "alpine3.23", "alpine3.22" ], - "version": "3.12.12" + "version": "3.12.13" }, "3.13": { "checksums": { From 50e3f493467278f72b4d79e0d54a69711b1d7bcf Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 10 Mar 2026 07:49:28 -0700 Subject: [PATCH 10/10] Update 3.15-rc to 3.15.0a7 --- 3.15-rc/alpine3.22/Dockerfile | 4 ++-- 3.15-rc/alpine3.23/Dockerfile | 4 ++-- 3.15-rc/bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-bookworm/Dockerfile | 4 ++-- 3.15-rc/slim-trixie/Dockerfile | 4 ++-- 3.15-rc/trixie/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile | 4 ++-- 3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile | 4 ++-- versions.json | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/3.15-rc/alpine3.22/Dockerfile b/3.15-rc/alpine3.22/Dockerfile index 9a41b3ee7..2960eb96a 100644 --- a/3.15-rc/alpine3.22/Dockerfile +++ b/3.15-rc/alpine3.22/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/alpine3.23/Dockerfile b/3.15-rc/alpine3.23/Dockerfile index fd7b8883f..2c76b46a4 100644 --- a/3.15-rc/alpine3.23/Dockerfile +++ b/3.15-rc/alpine3.23/Dockerfile @@ -16,8 +16,8 @@ RUN set -eux; \ tzdata \ ; -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/bookworm/Dockerfile b/3.15-rc/bookworm/Dockerfile index 7bf819c77..61732936f 100644 --- a/3.15-rc/bookworm/Dockerfile +++ b/3.15-rc/bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/slim-bookworm/Dockerfile b/3.15-rc/slim-bookworm/Dockerfile index 8a8505095..cbc3ffc49 100644 --- a/3.15-rc/slim-bookworm/Dockerfile +++ b/3.15-rc/slim-bookworm/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ rm -rf /var/lib/apt/lists/* -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/slim-trixie/Dockerfile b/3.15-rc/slim-trixie/Dockerfile index 9a60b4574..5c68c3841 100644 --- a/3.15-rc/slim-trixie/Dockerfile +++ b/3.15-rc/slim-trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/trixie/Dockerfile b/3.15-rc/trixie/Dockerfile index 785689ee1..46959be2a 100644 --- a/3.15-rc/trixie/Dockerfile +++ b/3.15-rc/trixie/Dockerfile @@ -19,8 +19,8 @@ RUN set -eux; \ ; \ apt-get dist-clean -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7 RUN set -eux; \ \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile index a67adc5ac..62b571a30 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 d756f2fade118cf01bb7a0bc2bf0feb36fffee99ae92bb92b75a455d70fecb3c RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile index 0643097a6..16af096b2 100644 --- a/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile +++ b/3.15-rc/windows/windowsservercore-ltsc2025/Dockerfile @@ -11,8 +11,8 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref # https://github.com/docker-library/python/pull/557 ENV PYTHONIOENCODING UTF-8 -ENV PYTHON_VERSION 3.15.0a6 -ENV PYTHON_SHA256 6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3 +ENV PYTHON_VERSION 3.15.0a7 +ENV PYTHON_SHA256 d756f2fade118cf01bb7a0bc2bf0feb36fffee99ae92bb92b75a455d70fecb3c RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f ($env:PYTHON_VERSION -replace '[a-z]+[0-9]*$', ''), $env:PYTHON_VERSION); \ Write-Host ('Downloading {0} ...' -f $url); \ diff --git a/versions.json b/versions.json index 53bcfac81..22cd4c7cd 100644 --- a/versions.json +++ b/versions.json @@ -98,10 +98,10 @@ "3.15-rc": { "checksums": { "source": { - "sha256": "8e2a4e1b2afb93a84d659d431b1f384544b3da00a4b8ff5bf3580f07ad4ff989" + "sha256": "8f590c428b7f0d406df928b85737e7a3afa28eddd4d1419410ea809687ed1ea7" }, "windows": { - "sha256": "6ace2216361f81a286f5957f522e7a212f400ab3f2055f6aa1c84e605a5c55c3" + "sha256": "d756f2fade118cf01bb7a0bc2bf0feb36fffee99ae92bb92b75a455d70fecb3c" } }, "variants": [ @@ -114,6 +114,6 @@ "windows/windowsservercore-ltsc2025", "windows/windowsservercore-ltsc2022" ], - "version": "3.15.0a6" + "version": "3.15.0a7" } }