diff --git a/Dockerfile.base b/Dockerfile.base index 2f940ed..a3efdcb 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -ARG PYTHONTAG=3.11.9-slim-bookworm +ARG PYTHONTAG=3.11.10-slim-bookworm FROM docker.io/python:${PYTHONTAG} AS base-upstream FROM base-upstream AS base-intermediate diff --git a/Dockerfile.deps b/Dockerfile.deps index 4557809..c033d25 100644 --- a/Dockerfile.deps +++ b/Dockerfile.deps @@ -40,8 +40,15 @@ RUN w=$(mktemp -d) ; : "${w:?}" ; \ python-rm-cache.sh /usr/local ; \ rm -rf \ "${PYTHON_SITE_PACKAGES}/etcd/tests" \ + "${PYTHON_SITE_PACKAGES}/netaddr/tests" \ "${PYTHON_SITE_PACKAGES}/psutil/tests" \ ; \ + truncate -s 0 \ + "${PYTHON_SITE_PACKAGES}/netaddr/eui/iab.idx" \ + "${PYTHON_SITE_PACKAGES}/netaddr/eui/iab.txt" \ + "${PYTHON_SITE_PACKAGES}/netaddr/eui/oui.txt" \ + "${PYTHON_SITE_PACKAGES}/netaddr/eui/oui.idx" \ + ; \ find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -exec ls -l {} + ; \ echo ; \ find "${PYTHON_SITE_PACKAGES}/" -type f -name '*.so*' -printf '%p\0' \ diff --git a/build-scripts/image-base.sh b/build-scripts/image-base.sh index 45323b0..1e059e9 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.9-slim-bookworm}" +PYTHONTAG="${PYTHONTAG:-3.11.10-slim-bookworm}" grab_site_packages() { podman run \ diff --git a/build-scripts/image.sh b/build-scripts/image.sh index dee9eb2..ac03b4c 100755 --- a/build-scripts/image.sh +++ b/build-scripts/image.sh @@ -8,7 +8,7 @@ BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" set +a -POSTGRESQL_VERSION="${1:-16.4}" +POSTGRESQL_VERSION="${1:-16.6}" PG_MAJOR="${POSTGRESQL_VERSION%%.*}" img="docker.io/rockdrilla/postgresql:${POSTGRESQL_VERSION}" diff --git a/requirements.txt b/requirements.txt index 90bd9a4..a16d138 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,28 @@ ## psycopg[c,pool] -psycopg-c==3.2.1 +psycopg-c==3.2.3 typing_extensions==4.12.2 -psycopg-pool==3.2.2 -psycopg[c,pool]==3.2.1 +psycopg-pool==3.2.4 +psycopg[c,pool]==3.2.3 ## patroni[etcd3,kubernetes] click==8.1.7 wcwidth==0.2.13 -prettytable==3.11.0 -psutil==6.0.0 +prettytable==3.12.0 +psutil==6.1.0 six==1.16.0 python-dateutil==2.9.0.post0 PyYAML==6.0.2 -urllib3==2.2.2 -ydiff==1.3 -dnspython==2.6.1 +urllib3==2.2.3 +ydiff==1.4.2 +dnspython==2.7.0 python-etcd==0.4.5 -patroni[etcd3,kubernetes]==3.3.2 +patroni[etcd3,kubernetes]==4.0.4 ## misc cdiff==1.0 pycparser==2.22 -cffi==1.17.0 -cryptography==43.0.0 +cffi==1.17.1 +cryptography==44.0.0 +netaddr==1.3.0