Daily automatic update

EnterpriseDB · Nov 27, 2024 · 30282db · 30282db
1 parent 715cf15
commit 30282db
Show file tree

Hide file tree

Showing 109 changed files with 546 additions and 456 deletions.
diff --git a/UBI/12/.versions-postgis-ubi8.json b/UBI/12/.versions-postgis-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGIS_VERSION": "3.4.3",
   "POSTGRES_VERSION": "12.22",
   "UBI_VERSION": "8.10-1132.1731461736"

diff --git a/UBI/12/.versions-postgis-ubi9.json b/UBI/12/.versions-postgis-ubi9.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGIS_VERSION": "3.4.3",
   "POSTGRES_VERSION": "12.22",
   "UBI_VERSION": "9.5-1731517889"

diff --git a/UBI/12/.versions-ubi8.json b/UBI/12/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGRES_VERSION": "12.22",
   "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/12/.versions-ubi9.json b/UBI/12/.versions-ubi9.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGRES_VERSION": "12.22",
   "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/12/Dockerfile.multiarch.ubi8 b/UBI/12/Dockerfile.multiarch.ubi8
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.multiarch.ubi9 b/UBI/12/Dockerfile.multiarch.ubi9
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/Dockerfile.multilang.ubi8 b/UBI/12/Dockerfile.multilang.ubi8
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.multilang.ubi9 b/UBI/12/Dockerfile.multilang.ubi9
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/Dockerfile.postgis-multiarch.ubi8 b/UBI/12/Dockerfile.postgis-multiarch.ubi8
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.postgis-multiarch.ubi9 b/UBI/12/Dockerfile.postgis-multiarch.ubi9
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/Dockerfile.postgis-multilang.ubi8 b/UBI/12/Dockerfile.postgis-multilang.ubi8
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.postgis-multilang.ubi9 b/UBI/12/Dockerfile.postgis-multilang.ubi9
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/Dockerfile.postgis.ubi8 b/UBI/12/Dockerfile.postgis.ubi8
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.postgis.ubi9 b/UBI/12/Dockerfile.postgis.ubi9
@@ -7,7 +7,7 @@ LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/Dockerfile.ubi8 b/UBI/12/Dockerfile.ubi8
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/12/Dockerfile.ubi9 b/UBI/12/Dockerfile.ubi9
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="12.22" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/12/root/requirements.txt b/UBI/12/root/requirements.txt
@@ -20,12 +20,12 @@ barman[azure,cloud,google,snappy]==3.11.1 \
     --hash=sha256:295b9b7e058e064338f66ca0d10e4892e784a2347f06e4a225164995f6114498 \
     --hash=sha256:4f424f3327cb24fb82d6a29dc1cdf02222b950c447c78273273d6eb76d7ce8d7
     # via -r requirements.in
-boto3==1.35.68 \
-    --hash=sha256:091d6bed1422370987a839bff3f8755df7404fc15e9fac2a48e8505356f07433 \
-    --hash=sha256:9b26fa31901da7793c1dcd65eee9bab7e897d8aa1ffed0b5e1c3bce93d2aefe4
-botocore==1.35.68 \
-    --hash=sha256:42c3700583a82f2b5316281a073d644a521d6358837e2b446dc458ba5d990fb4 \
-    --hash=sha256:599139d5564291f5be873800711f9e4e14a823395ae9ce7b142be775e9849b94
+boto3==1.35.70 \
+    --hash=sha256:121dce8c7102eea6a6047d46bcd74e8a24dac793a4a3857de4f4bad9c12566fd \
+    --hash=sha256:ca385708f83f01b3f27d9d675880d2458cb3b40ed1e25da688f551454ed0c112
+botocore==1.35.70 \
+    --hash=sha256:18d1bb505722d9efd50c50719ed8de7284bfe6d3908a9e08756a7646e549da21 \
+    --hash=sha256:ba8a4797cf7c5d9c237e67a62692f5146e895613fd3e6a43b00b66f3a8c7fc73
     # via
     #   boto3
     #   s3transfer

diff --git a/UBI/13/.versions-postgis-ubi8.json b/UBI/13/.versions-postgis-ubi8.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "20",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "13.16",
-  "UBI_VERSION": "8.10-1054"
+  "POSTGRES_VERSION": "13.18",
+  "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/13/.versions-postgis-ubi9.json b/UBI/13/.versions-postgis-ubi9.json
@@ -1,7 +1,7 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "21",
+  "IMAGE_RELEASE_VERSION": "1",
   "POSTGIS_VERSION": "3.4.2",
-  "POSTGRES_VERSION": "13.16",
-  "UBI_VERSION": "9.4-1214"
+  "POSTGRES_VERSION": "13.18",
+  "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/13/.versions-ubi8.json b/UBI/13/.versions-ubi8.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGRES_VERSION": "13.18",
   "UBI_VERSION": "8.10-1132.1731461736"
 }
diff --git a/UBI/13/.versions-ubi9.json b/UBI/13/.versions-ubi9.json
@@ -1,6 +1,6 @@
 {
   "BARMAN_VERSION": "3.11.1",
-  "IMAGE_RELEASE_VERSION": "4",
+  "IMAGE_RELEASE_VERSION": "5",
   "POSTGRES_VERSION": "13.18",
   "UBI_VERSION": "9.5-1731517889"
 }
diff --git a/UBI/13/Dockerfile.multiarch.ubi8 b/UBI/13/Dockerfile.multiarch.ubi8
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.18" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/13/Dockerfile.multiarch.ubi9 b/UBI/13/Dockerfile.multiarch.ubi9
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.18" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/13/Dockerfile.multilang.ubi8 b/UBI/13/Dockerfile.multilang.ubi8
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.18" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 

diff --git a/UBI/13/Dockerfile.multilang.ubi9 b/UBI/13/Dockerfile.multilang.ubi9
@@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
       version="13.18" \
-      release="4" \
+      release="5" \
       summary="PostgreSQL Container images." \
       description="This Docker image contains PostgreSQL and Barman Cloud based on RedHat Universal Base Images (UBI) 9."
 

diff --git a/UBI/13/Dockerfile.postgis-multiarch.ubi8 b/UBI/13/Dockerfile.postgis-multiarch.ubi8
@@ -1,13 +1,13 @@
 # vim:set ft=dockerfile:
-FROM quay.io/enterprisedb/edb-ubi:8.10-1054
+FROM quay.io/enterprisedb/edb-ubi:8.10-1132.1731461736
 ARG SUBSCRIPTION_NAME
 
 # Do not split the description, otherwise we will see a blank space in the labels
 LABEL name="PostgreSQL + PostGIS Container Images" \
       vendor="EnterpriseDB" \
       url="https://www.enterprisedb.com/" \
-      version="13.16" \
-      release="20" \
+      version="13.18" \
+      release="1" \
       summary="PostgreSQL + PostGIS Container images." \
       description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 8."
 
@@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \
 	pg_squeeze_pkg="pg_squeeze_13" ; \
 	pgvector="pgvector_13" ; \
 	pg_audit_pkg="pgaudit15_13" ; \
+	wal2json_pkg="wal2json_13" ; \
 	case $ARCH in \
 			amd64) \
 					yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \
@@ -37,38 +38,41 @@ RUN --mount=type=secret,id=cs_token \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			s390x) \
 					curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
 					pg_failover_slots_pkg="edb-pg13-pg-failover-slots1" ; \
 					pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
 					pgvector="edb-pg13-pgvector0" ; \
 					pg_audit_pkg="edb-pg13-pgaudit1" ; \
+					wal2json_pkg="edb-pg13-wal2json2" ; \
 					if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
 			*) \
 					exit 1 ;; \
 	esac ; \
 	yum -y upgrade glibc-common ; \
 	yum -y reinstall glibc-common ; \
 	rm -fr /etc/rpm/macros.image-language-conf ; \
-	yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
-	yum -y --setopt=tsflags=nodocs install \
-			postgresql13-13.16 \
-			postgresql13-contrib-13.16 \
-			postgresql13-server-13.16 \
-			postgresql13-libs-13.16 \
+	yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
+	yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
+			postgresql13-13.18 \
+			postgresql13-contrib-13.18 \
+			postgresql13-server-13.18 \
+			postgresql13-libs-13.18 \
 			"$pg_audit_pkg" \
 			"$pg_squeeze_pkg" \
 			"$pg_failover_slots_pkg" \
 			"$pgvector" \
+			"$wal2json_pkg" \
 	; \
 	rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
 	rm -fr /tmp/* ; \
 	yum -y clean all --enablerepo='*'
 
 # Install barman-cloud
 RUN set -xe ; \
-	yum -y install python3.11-pip python3.11-psycopg2 ; \
+	yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
 	pip3.11 install --upgrade pip ; \
 	pip3.11 install -r requirements.txt ; \
 	yum -y clean all --enablerepo='*'
@@ -122,7 +126,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
 			*) \
 					exit 1 ;; \
 	esac ; \
-	yum -y install --enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
+	yum -y install --setopt=install_weak_deps=0 \
+		--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
 		postgis34_13-3.4.2 \
 		"$pgrouting_pkg" \
 	; \