diff --git a/bookworm-multipython/Dockerfile b/bookworm-multipython/Dockerfile index dc6908b0138f17f64ef4f7e65e048dde5c76a750..cd63124e5f1eed1ce56b365e6f1530024813926a 100644 --- a/bookworm-multipython/Dockerfile +++ b/bookworm-multipython/Dockerfile @@ -15,6 +15,7 @@ ARG py39_version=3.9.19 ARG py310_version=3.10.14 ARG py311_version=3.11.9 ARG py312_version=3.12.5 +ARG pypy310_version=pypy3.10-7.3.17 RUN groupadd -g ${gid} ${group} RUN groupadd -g ${docker_gid} docker @@ -297,6 +298,14 @@ RUN --mount=type=secret,mode=0444,id=SCCACHE_REDIS_ENDPOINT \ MAKEOPTS='-j8' \ pyenv install --verbose ${py312_version} +FROM build_pyenv AS build_pypy310 +RUN --mount=type=secret,mode=0444,id=SCCACHE_REDIS_ENDPOINT \ + --mount=type=secret,mode=0444,id=SCCACHE_REDIS_PASSWORD \ + env-from-secrets \ + PYTHON_CONFIGURE_OPTS='--with-lto' \ + MAKEOPTS='-j8' \ + pyenv install --verbose ${pypy310_version} + FROM build_bookworm_with_packages_and_rust ENV PYENV_ROOT "/home/${user}/.pyenv" @@ -316,8 +325,10 @@ COPY --from=build_py311 --chown=jenkins:jenkins ${PYENV_ROOT}/versions/${py311_v COPY --from=build_py312 --chown=jenkins:jenkins ${PYENV_ROOT}/versions/${py312_version} ${PYENV_ROOT}/versions/${py312_version} +COPY --from=build_pypy310 --chown=jenkins:jenkins ${PYENV_ROOT}/versions/${pypy310_version} ${PYENV_ROOT}/versions/${pypy310_version} + RUN pyenv rehash -RUN pyenv global ${py37_version} ${py38_version} ${py39_version} ${py310_version} ${py311_version} ${py312_version} +RUN pyenv global ${py37_version} ${py38_version} ${py39_version} ${py310_version} ${py311_version} ${py312_version} ${pypy310_version} ENV SWH_PYTHON_FOR_GLOBAL_TOOLS python3.11