switch to Python 3.12

This commit is contained in:
Konstantin Demin 2025-02-21 11:30:12 +03:00
parent d8c7de04a5
commit f0d9f41a3d
Signed by: krd
GPG Key ID: 4D56F87A8BA65FD0
4 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
ARG PYTHONTAG=3.11.11-slim-bookworm ARG PYTHONTAG=3.12.9-slim-bookworm
FROM docker.io/python:${PYTHONTAG} AS base-upstream FROM docker.io/python:${PYTHONTAG} AS base-upstream
FROM base-upstream AS base-intermediate FROM base-upstream AS base-intermediate
@ -241,7 +241,7 @@ RUN set -f ; \
done done
## "docker.io/python"-specific cleanup ## "docker.io/python"-specific cleanup
RUN rm -f /root/.wget-hsts RUN env -C /root rm -f .bash_history .python_history .wget-hsts
RUN pip-env.sh pip list --format freeze \ RUN pip-env.sh pip list --format freeze \
| grep -F '==' | awk -F= '{print $1}' \ | grep -F '==' | awk -F= '{print $1}' \

View File

@ -8,7 +8,7 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
set +a set +a
PYTHONTAG="${PYTHONTAG:-3.11.11-slim-bookworm}" PYTHONTAG="${PYTHONTAG:-3.12.9-slim-bookworm}"
grab_site_packages() { grab_site_packages() {
podman run \ podman run \
@ -27,7 +27,7 @@ grab_site_packages() {
PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}") PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}")
[ -n "${PYTHON_SITE_PACKAGES:?}" ] [ -n "${PYTHON_SITE_PACKAGES:?}" ]
img="docker.io/rockdrilla/postgresql:base-v2" img="docker.io/rockdrilla/postgresql:base-v3"
buildah bud \ buildah bud \
-f ./Dockerfile.base \ -f ./Dockerfile.base \

View File

@ -8,8 +8,8 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
set +a set +a
img="docker.io/rockdrilla/postgresql:deps-v2" img="docker.io/rockdrilla/postgresql:deps-v3"
base="docker.io/rockdrilla/postgresql:base-v2" base="docker.io/rockdrilla/postgresql:base-v3"
exec buildah bud \ exec buildah bud \
-f ./Dockerfile.deps \ -f ./Dockerfile.deps \

View File

@ -12,7 +12,7 @@ POSTGRESQL_VERSION="${1:-16.7}"
PG_MAJOR="${POSTGRESQL_VERSION%%.*}" PG_MAJOR="${POSTGRESQL_VERSION%%.*}"
img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}" img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}"
deps="docker.io/rockdrilla/postgresql:deps-v2" deps="docker.io/rockdrilla/postgresql:deps-v3"
c=$(buildah from --pull=missing "${deps}") c=$(buildah from --pull=missing "${deps}")
[ -n "${c:?}" ] [ -n "${c:?}" ]