diff --git a/Dockerfile.base b/Dockerfile.base index 657c12b..fc7e4b3 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -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 base-upstream AS base-intermediate @@ -241,7 +241,7 @@ RUN set -f ; \ done ## "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 \ | grep -F '==' | awk -F= '{print $1}' \ diff --git a/build-scripts/image-base.sh b/build-scripts/image-base.sh index 65cd2db..41c0c44 100755 --- a/build-scripts/image-base.sh +++ b/build-scripts/image-base.sh @@ -8,7 +8,7 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" set +a -PYTHONTAG="${PYTHONTAG:-3.11.11-slim-bookworm}" +PYTHONTAG="${PYTHONTAG:-3.12.9-slim-bookworm}" grab_site_packages() { podman run \ @@ -27,7 +27,7 @@ grab_site_packages() { PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}") [ -n "${PYTHON_SITE_PACKAGES:?}" ] -img="docker.io/rockdrilla/postgresql:base-v2" +img="docker.io/rockdrilla/postgresql:base-v3" buildah bud \ -f ./Dockerfile.base \ diff --git a/build-scripts/image-deps.sh b/build-scripts/image-deps.sh index 2a0cb3a..d30d0e2 100755 --- a/build-scripts/image-deps.sh +++ b/build-scripts/image-deps.sh @@ -8,8 +8,8 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" set +a -img="docker.io/rockdrilla/postgresql:deps-v2" -base="docker.io/rockdrilla/postgresql:base-v2" +img="docker.io/rockdrilla/postgresql:deps-v3" +base="docker.io/rockdrilla/postgresql:base-v3" exec buildah bud \ -f ./Dockerfile.deps \ diff --git a/build-scripts/image.sh b/build-scripts/image.sh index 34dd332..3eb621d 100755 --- a/build-scripts/image.sh +++ b/build-scripts/image.sh @@ -12,7 +12,7 @@ POSTGRESQL_VERSION="${1:-16.7}" PG_MAJOR="${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}") [ -n "${c:?}" ]