From fd6e8d2ccae70b0ff961d1087d7f0fe49533249c Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sat, 21 Dec 2024 14:22:02 +0000 Subject: Bump pyenv to v2.4.23 for 3.13.1 & 3.12.8 support --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 911ef27..2172db1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,23 +29,23 @@ RUN apt-get -y update \ tk-dev \ && rm -rf /var/lib/apt/lists/* -RUN git clone -b v2.4.15 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT +RUN git clone -b v2.4.23 --depth 1 https://github.com/pyenv/pyenv.git $PYENV_ROOT COPY --link scripts/build_python.sh / # ------------------------------------------------------------------------------ FROM builder-py-base as builder-py-3_12 -RUN /build_python.sh 3.12.7 +RUN /build_python.sh 3.12.8 # ------------------------------------------------------------------------------ FROM builder-py-base as builder-py-3_13 -RUN /build_python.sh 3.13.0 +RUN /build_python.sh 3.13.1 # ------------------------------------------------------------------------------ FROM builder-py-base as builder-py-3_13t # Building with all 3 of the options below causes tests to fail. # Removing just the first means the image is a bit bigger, but we keep optimisations # --disable-test-modules --enable-optimizations --with-lto ENV PYTHON_CONFIGURE_OPTS='--enable-optimizations --with-lto --with-system-expat --without-ensurepip' -RUN /build_python.sh 3.13.0t +RUN /build_python.sh 3.13.1t # ------------------------------------------------------------------------------ FROM python:3.12-slim-bookworm as base -- cgit v1.2.3 From a5d26d7850d51229ac7e397c08bb02c4da035a74 Mon Sep 17 00:00:00 2001 From: Chris Lovering Date: Sat, 21 Dec 2024 14:24:18 +0000 Subject: Remove PYTHON_CONFIGURE_OPTS overrides now that the bug is fixed in 3.13t building --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2172db1..469d65e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,10 +41,6 @@ FROM builder-py-base as builder-py-3_13 RUN /build_python.sh 3.13.1 # ------------------------------------------------------------------------------ FROM builder-py-base as builder-py-3_13t -# Building with all 3 of the options below causes tests to fail. -# Removing just the first means the image is a bit bigger, but we keep optimisations -# --disable-test-modules --enable-optimizations --with-lto -ENV PYTHON_CONFIGURE_OPTS='--enable-optimizations --with-lto --with-system-expat --without-ensurepip' RUN /build_python.sh 3.13.1t # ------------------------------------------------------------------------------ FROM python:3.12-slim-bookworm as base -- cgit v1.2.3