From 91d3a48177b69613034bc2a8435d029faf931cca Mon Sep 17 00:00:00 2001
From: Konstantin Demin <rockdrilla@gmail.com>
Date: Wed, 9 Apr 2025 14:46:16 +0300
Subject: [PATCH] update deps
---
Dockerfile.base | 3 ++-
apt/preferences.backports | 31 +++++++++++++++++++++++++++----
build-scripts/image-base.sh | 4 ++--
build-scripts/image-deps.sh | 4 ++--
build-scripts/image.sh | 2 +-
requirements.txt | 12 ++++++------
6 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/Dockerfile.base b/Dockerfile.base
index d2ca12c..518cf83 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,4 +1,4 @@
-ARG PYTHONTAG=3.12.9-slim-bookworm
+ARG PYTHONTAG=3.12.10-slim-bookworm
FROM docker.io/python:${PYTHONTAG} AS base-upstream
FROM base-upstream AS base-intermediate
@@ -52,6 +52,7 @@ RUN apt-env.sh apt-get update ; \
; \
apt-env.sh apt-get upgrade -y ; \
apt-install.sh \
+ apt-utils \
brotli \
cron \
curl \
diff --git a/apt/preferences.backports b/apt/preferences.backports
index 8658903..dabc1ee 100644
--- a/apt/preferences.backports
+++ b/apt/preferences.backports
@@ -1,4 +1,27 @@
-## example:
-# Package: src:curl
-# Pin: release n=bookworm-backports
-# Pin-Priority: 600
+Package: src:curl
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:e2fsprogs
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:elfutils
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:iproute2
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:libbpf
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:systemd
+Pin: release n=bookworm-backports
+Pin-Priority: 600
+
+Package: src:sysvinit
+Pin: release n=bookworm-backports
+Pin-Priority: 600
diff --git a/build-scripts/image-base.sh b/build-scripts/image-base.sh
index 8ef7f91..91376c5 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.12.9-slim-bookworm}"
+PYTHONTAG="${PYTHONTAG:-3.12.10-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-v3"
+img="docker.io/rockdrilla/postgresql:base-v4"
buildah bud \
-f ./Dockerfile.base \
diff --git a/build-scripts/image-deps.sh b/build-scripts/image-deps.sh
index d30d0e2..409042b 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-v3"
-base="docker.io/rockdrilla/postgresql:base-v3"
+img="docker.io/rockdrilla/postgresql:deps-v4"
+base="docker.io/rockdrilla/postgresql:base-v4"
exec buildah bud \
-f ./Dockerfile.deps \
diff --git a/build-scripts/image.sh b/build-scripts/image.sh
index 3eb621d..07fa4d1 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-v3"
+deps="docker.io/rockdrilla/postgresql:deps-v4"
c=$(buildah from --pull=missing "${deps}")
[ -n "${c:?}" ]
diff --git a/requirements.txt b/requirements.txt
index a3cc3fb..4becd4b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,15 +1,15 @@
## psycopg[c,pool]
-psycopg-c==3.2.4
-typing_extensions==4.12.2
-psycopg-pool==3.2.4
-psycopg[c,pool]==3.2.4
+psycopg-c==3.2.6
+typing_extensions==4.13.1
+psycopg-pool==3.2.6
+psycopg[c,pool]==3.2.6
## patroni[etcd3,kubernetes]
click==8.1.8
wcwidth==0.2.13
-prettytable==3.14.0
+prettytable==3.16.0
psutil==7.0.0
six==1.17.0
python-dateutil==2.9.0.post0
@@ -24,5 +24,5 @@ patroni[etcd3,kubernetes]==4.0.5
cdiff==1.0
pycparser==2.22
cffi==1.17.1
-cryptography==44.0.1
+cryptography==44.0.2
netaddr==1.3.0