diff --git a/UBI/12/.versions-postgis-ubi8.json b/UBI/12/.versions-postgis-ubi8.json index a9b603ed..ad8f2368 100644 --- 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 index f7fa210d..957e70e4 100644 --- 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 index c79e662f..f3500b91 100644 --- 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 index 3ec8e37f..71c5af7f 100644 --- 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 index 8943ecad..3e894b33 100644 --- 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 index 7b46a548..d26c6aa7 100644 --- 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 index b0a1fc75..0a888dc0 100644 --- 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 index 81d60f88..afab563c 100644 --- 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 index a9a731be..0f8ea260 100644 --- 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 index 3b6f716b..cba71ba5 100644 --- 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 index f7d90792..cb4efdc9 100644 --- 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 index 645ccdda..e53c0cad 100644 --- 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 index 42a79023..036e4d8d 100644 --- 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 index 97663691..05dc498e 100644 --- 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 index 9ae5d09f..56938174 100644 --- 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 index 2a0749ff..797530f2 100644 --- 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 index ab09bf71..8fbd1ddc 100644 --- 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 index 7fb2de67..56415c93 100644 --- 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 index 8e6f811b..704b47a3 100644 --- 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 index 08f092e9..044a13df 100644 --- 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 index 03fc8197..16281dae 100644 --- 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 index 3f8315a6..47f75a03 100644 --- 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 index e3e4da79..6a5dbcae 100644 --- 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 index 49140af4..e4c8cb38 100644 --- 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 index 21cc2f82..321821c8 100644 --- 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 index 4ca6f7be..94747de1 100644 --- 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,6 +38,7 @@ 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 ; \ @@ -44,6 +46,7 @@ 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 ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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" \ ; \ diff --git a/UBI/13/Dockerfile.postgis-multiarch.ubi9 b/UBI/13/Dockerfile.postgis-multiarch.ubi9 index 1085caa8..31db3f68 100644 --- a/UBI/13/Dockerfile.postgis-multiarch.ubi9 +++ b/UBI/13/Dockerfile.postgis-multiarch.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="21" \ + 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) 9." @@ -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-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ 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 ; \ @@ -44,6 +46,7 @@ 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 ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_13-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/13/Dockerfile.postgis-multilang.ubi8 b/UBI/13/Dockerfile.postgis-multilang.ubi8 index 2b307c39..ad6a4c8f 100644 --- a/UBI/13/Dockerfile.postgis-multilang.ubi8 +++ b/UBI/13/Dockerfile.postgis-multilang.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." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 --setopt=install_weak_deps=0 install 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_failover_slots_13 \ pg_squeeze_13 \ "$pg_audit_pkg" \ pgvector_13 \ + wal2json_13 \ ; \ 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='*' @@ -91,7 +92,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_13 \ ; \ diff --git a/UBI/13/Dockerfile.postgis-multilang.ubi9 b/UBI/13/Dockerfile.postgis-multilang.ubi9 index d409417d..3ba0bc61 100644 --- a/UBI/13/Dockerfile.postgis-multilang.ubi9 +++ b/UBI/13/Dockerfile.postgis-multilang.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="21" \ + 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) 9." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 --setopt=install_weak_deps=0 install 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_failover_slots_13 \ pg_squeeze_13 \ "$pg_audit_pkg" \ pgvector_13 \ + wal2json_13 \ ; \ 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='*' @@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_13-3.4.2 \ pgrouting_13 \ ; \ diff --git a/UBI/13/Dockerfile.postgis.ubi8 b/UBI/13/Dockerfile.postgis.ubi8 index 64b5e834..1c9756a2 100644 --- a/UBI/13/Dockerfile.postgis.ubi8 +++ b/UBI/13/Dockerfile.postgis.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." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - 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 ; \ + 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_failover_slots_13 \ pg_squeeze_13 \ "$pg_audit_pkg" \ pgvector_13 \ + wal2json_13 \ ; \ 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='*' @@ -90,7 +91,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_13 \ ; \ diff --git a/UBI/13/Dockerfile.postgis.ubi9 b/UBI/13/Dockerfile.postgis.ubi9 index de12ecc2..5df163d9 100644 --- a/UBI/13/Dockerfile.postgis.ubi9 +++ b/UBI/13/Dockerfile.postgis.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="21" \ + 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) 9." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - 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 ; \ + 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_failover_slots_13 \ pg_squeeze_13 \ "$pg_audit_pkg" \ pgvector_13 \ + wal2json_13 \ ; \ 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='*' @@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_13-3.4.2 \ pgrouting_13 \ ; \ diff --git a/UBI/13/Dockerfile.ubi8 b/UBI/13/Dockerfile.ubi8 index 6cacd404..696b094c 100644 --- a/UBI/13/Dockerfile.ubi8 +++ b/UBI/13/Dockerfile.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.ubi9 b/UBI/13/Dockerfile.ubi9 index 28d0546f..60d25aa6 100644 --- a/UBI/13/Dockerfile.ubi9 +++ b/UBI/13/Dockerfile.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/root/requirements.txt b/UBI/13/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/13/root/requirements.txt +++ b/UBI/13/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/14/.versions-postgis-ubi8.json b/UBI/14/.versions-postgis-ubi8.json index 0503e236..c52bac05 100644 --- a/UBI/14/.versions-postgis-ubi8.json +++ b/UBI/14/.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": "14.13", - "UBI_VERSION": "8.10-1054" + "POSTGRES_VERSION": "14.15", + "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/14/.versions-postgis-ubi9.json b/UBI/14/.versions-postgis-ubi9.json index 57180184..b4ace869 100644 --- a/UBI/14/.versions-postgis-ubi9.json +++ b/UBI/14/.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": "14.13", - "UBI_VERSION": "9.4-1214" + "POSTGRES_VERSION": "14.15", + "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/14/.versions-ubi8.json b/UBI/14/.versions-ubi8.json index 3d488735..e3af0380 100644 --- a/UBI/14/.versions-ubi8.json +++ b/UBI/14/.versions-ubi8.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "14.15", "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/14/.versions-ubi9.json b/UBI/14/.versions-ubi9.json index cc37f3d0..0f198e88 100644 --- a/UBI/14/.versions-ubi9.json +++ b/UBI/14/.versions-ubi9.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "14.15", "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/14/Dockerfile.multiarch.ubi8 b/UBI/14/Dockerfile.multiarch.ubi8 index 75e2265c..3a789a1f 100644 --- a/UBI/14/Dockerfile.multiarch.ubi8 +++ b/UBI/14/Dockerfile.multiarch.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/Dockerfile.multiarch.ubi9 b/UBI/14/Dockerfile.multiarch.ubi9 index 0650ac73..6b838a74 100644 --- a/UBI/14/Dockerfile.multiarch.ubi9 +++ b/UBI/14/Dockerfile.multiarch.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/Dockerfile.multilang.ubi8 b/UBI/14/Dockerfile.multilang.ubi8 index 03a24be4..f5bef171 100644 --- a/UBI/14/Dockerfile.multilang.ubi8 +++ b/UBI/14/Dockerfile.multilang.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/Dockerfile.multilang.ubi9 b/UBI/14/Dockerfile.multilang.ubi9 index 484dd0cf..fe12b480 100644 --- a/UBI/14/Dockerfile.multilang.ubi9 +++ b/UBI/14/Dockerfile.multilang.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/Dockerfile.postgis-multiarch.ubi8 b/UBI/14/Dockerfile.postgis-multiarch.ubi8 index 04d7e604..23ee2133 100644 --- a/UBI/14/Dockerfile.postgis-multiarch.ubi8 +++ b/UBI/14/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="14.13" \ - release="20" \ + version="14.15" \ + 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_14" ; \ pgvector="pgvector_14" ; \ pg_audit_pkg="pgaudit16_14" ; \ + wal2json_pkg="wal2json_14" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \ pgvector="edb-pg14-pgvector0" ; \ pg_audit_pkg="edb-pg14-pgaudit1" ; \ + wal2json_pkg="edb-pg14-wal2json2" ; \ if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \ pgvector="edb-pg14-pgvector0" ; \ pg_audit_pkg="edb-pg14-pgaudit1" ; \ + wal2json_pkg="edb-pg14-wal2json2" ; \ if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + 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 \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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_14-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/14/Dockerfile.postgis-multiarch.ubi9 b/UBI/14/Dockerfile.postgis-multiarch.ubi9 index 9a51a01a..4c0db2f8 100644 --- a/UBI/14/Dockerfile.postgis-multiarch.ubi9 +++ b/UBI/14/Dockerfile.postgis-multiarch.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="14.13" \ - release="21" \ + version="14.15" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="pg_squeeze_14" ; \ pgvector="pgvector_14" ; \ pg_audit_pkg="pgaudit16_14" ; \ + wal2json_pkg="wal2json_14" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \ pgvector="edb-pg14-pgvector0" ; \ pg_audit_pkg="edb-pg14-pgaudit1" ; \ + wal2json_pkg="edb-pg14-wal2json2" ; \ if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg14-pg-squeeze1" ; \ pgvector="edb-pg14-pgvector0" ; \ pg_audit_pkg="edb-pg14-pgaudit1" ; \ + wal2json_pkg="edb-pg14-wal2json2" ; \ if [ "14" -gt "15" ]; then pg_audit_pkg="edb-pg14-pgaudit14"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + 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 \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_14-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/14/Dockerfile.postgis-multilang.ubi8 b/UBI/14/Dockerfile.postgis-multilang.ubi8 index 3a82682b..7f37d6a6 100644 --- a/UBI/14/Dockerfile.postgis-multilang.ubi8 +++ b/UBI/14/Dockerfile.postgis-multilang.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="14.13" \ - release="20" \ + version="14.15" \ + 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." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ pg_failover_slots_14 \ pg_squeeze_14 \ "$pg_audit_pkg" \ pgvector_14 \ + wal2json_14 \ ; \ 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='*' @@ -91,7 +92,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_14-3.4.2 \ pgrouting_14 \ ; \ diff --git a/UBI/14/Dockerfile.postgis-multilang.ubi9 b/UBI/14/Dockerfile.postgis-multilang.ubi9 index 95f5b102..c0263f5d 100644 --- a/UBI/14/Dockerfile.postgis-multilang.ubi9 +++ b/UBI/14/Dockerfile.postgis-multilang.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="14.13" \ - release="21" \ + version="14.15" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ pg_failover_slots_14 \ pg_squeeze_14 \ "$pg_audit_pkg" \ pgvector_14 \ + wal2json_14 \ ; \ 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='*' @@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_14-3.4.2 \ pgrouting_14 \ ; \ diff --git a/UBI/14/Dockerfile.postgis.ubi8 b/UBI/14/Dockerfile.postgis.ubi8 index f9caf8a1..d64f672b 100644 --- a/UBI/14/Dockerfile.postgis.ubi8 +++ b/UBI/14/Dockerfile.postgis.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="14.13" \ - release="20" \ + version="14.15" \ + 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." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ pg_failover_slots_14 \ pg_squeeze_14 \ "$pg_audit_pkg" \ pgvector_14 \ + wal2json_14 \ ; \ 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='*' @@ -90,7 +91,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_14-3.4.2 \ pgrouting_14 \ ; \ diff --git a/UBI/14/Dockerfile.postgis.ubi9 b/UBI/14/Dockerfile.postgis.ubi9 index 72d1bed9..312c327f 100644 --- a/UBI/14/Dockerfile.postgis.ubi9 +++ b/UBI/14/Dockerfile.postgis.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="14.13" \ - release="21" \ + version="14.15" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql14-14.13 \ - postgresql14-contrib-14.13 \ - postgresql14-server-14.13 \ - postgresql14-libs-14.13 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql14-14.15 \ + postgresql14-contrib-14.15 \ + postgresql14-server-14.15 \ + postgresql14-libs-14.15 \ pg_failover_slots_14 \ pg_squeeze_14 \ "$pg_audit_pkg" \ pgvector_14 \ + wal2json_14 \ ; \ 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='*' @@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_14-3.4.2 \ pgrouting_14 \ ; \ diff --git a/UBI/14/Dockerfile.ubi8 b/UBI/14/Dockerfile.ubi8 index cadd21f0..e6e5d0a0 100644 --- a/UBI/14/Dockerfile.ubi8 +++ b/UBI/14/Dockerfile.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/Dockerfile.ubi9 b/UBI/14/Dockerfile.ubi9 index 15edb2a0..582cb330 100644 --- a/UBI/14/Dockerfile.ubi9 +++ b/UBI/14/Dockerfile.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="14.15" \ - 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/14/root/requirements.txt b/UBI/14/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/14/root/requirements.txt +++ b/UBI/14/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/15/.versions-postgis-ubi8.json b/UBI/15/.versions-postgis-ubi8.json index 08c3f418..83423fc7 100644 --- a/UBI/15/.versions-postgis-ubi8.json +++ b/UBI/15/.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": "15.8", - "UBI_VERSION": "8.10-1054" + "POSTGRES_VERSION": "15.10", + "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/15/.versions-postgis-ubi9.json b/UBI/15/.versions-postgis-ubi9.json index 21b8d09b..94d027de 100644 --- a/UBI/15/.versions-postgis-ubi9.json +++ b/UBI/15/.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": "15.8", - "UBI_VERSION": "9.4-1214" + "POSTGRES_VERSION": "15.10", + "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/15/.versions-ubi8.json b/UBI/15/.versions-ubi8.json index 551e3c34..21587725 100644 --- a/UBI/15/.versions-ubi8.json +++ b/UBI/15/.versions-ubi8.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "15.10", "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/15/.versions-ubi9.json b/UBI/15/.versions-ubi9.json index 0adca9e8..e1e05a0a 100644 --- a/UBI/15/.versions-ubi9.json +++ b/UBI/15/.versions-ubi9.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "15.10", "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/15/Dockerfile.multiarch.ubi8 b/UBI/15/Dockerfile.multiarch.ubi8 index 0e341f92..28aab7cf 100644 --- a/UBI/15/Dockerfile.multiarch.ubi8 +++ b/UBI/15/Dockerfile.multiarch.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.multiarch.ubi9 b/UBI/15/Dockerfile.multiarch.ubi9 index f1972f5f..e9580fd0 100644 --- a/UBI/15/Dockerfile.multiarch.ubi9 +++ b/UBI/15/Dockerfile.multiarch.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.multilang.ubi8 b/UBI/15/Dockerfile.multilang.ubi8 index 3423c8e7..864541cf 100644 --- a/UBI/15/Dockerfile.multilang.ubi8 +++ b/UBI/15/Dockerfile.multilang.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.multilang.ubi9 b/UBI/15/Dockerfile.multilang.ubi9 index 778ffd29..3aa0009c 100644 --- a/UBI/15/Dockerfile.multilang.ubi9 +++ b/UBI/15/Dockerfile.multilang.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.plv8.ubi8 b/UBI/15/Dockerfile.plv8.ubi8 index 87284594..bafc840d 100644 --- a/UBI/15/Dockerfile.plv8.ubi8 +++ b/UBI/15/Dockerfile.plv8.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.plv8.ubi9 b/UBI/15/Dockerfile.plv8.ubi9 index 837ddbe1..e7052c55 100644 --- a/UBI/15/Dockerfile.plv8.ubi9 +++ b/UBI/15/Dockerfile.plv8.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.postgis-multiarch.ubi8 b/UBI/15/Dockerfile.postgis-multiarch.ubi8 index a9373d86..df7936cc 100644 --- a/UBI/15/Dockerfile.postgis-multiarch.ubi8 +++ b/UBI/15/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="15.8" \ - release="20" \ + version="15.10" \ + 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_15" ; \ pgvector="pgvector_15" ; \ pg_audit_pkg="pgaudit17_15" ; \ + wal2json_pkg="wal2json_15" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \ pgvector="edb-pg15-pgvector0" ; \ pg_audit_pkg="edb-pg15-pgaudit1" ; \ + wal2json_pkg="edb-pg15-wal2json2" ; \ if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \ pgvector="edb-pg15-pgvector0" ; \ pg_audit_pkg="edb-pg15-pgaudit1" ; \ + wal2json_pkg="edb-pg15-wal2json2" ; \ if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + 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 \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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_15-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/15/Dockerfile.postgis-multiarch.ubi9 b/UBI/15/Dockerfile.postgis-multiarch.ubi9 index ec68fbb0..d6a8e196 100644 --- a/UBI/15/Dockerfile.postgis-multiarch.ubi9 +++ b/UBI/15/Dockerfile.postgis-multiarch.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="15.8" \ - release="21" \ + version="15.10" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="pg_squeeze_15" ; \ pgvector="pgvector_15" ; \ pg_audit_pkg="pgaudit17_15" ; \ + wal2json_pkg="wal2json_15" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \ pgvector="edb-pg15-pgvector0" ; \ pg_audit_pkg="edb-pg15-pgaudit1" ; \ + wal2json_pkg="edb-pg15-wal2json2" ; \ if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg15-pg-squeeze1" ; \ pgvector="edb-pg15-pgvector0" ; \ pg_audit_pkg="edb-pg15-pgaudit1" ; \ + wal2json_pkg="edb-pg15-wal2json2" ; \ if [ "15" -gt "15" ]; then pg_audit_pkg="edb-pg15-pgaudit15"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + 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 \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_15-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/15/Dockerfile.postgis-multilang.ubi8 b/UBI/15/Dockerfile.postgis-multilang.ubi8 index 4d8d07f8..b4ba0e0b 100644 --- a/UBI/15/Dockerfile.postgis-multilang.ubi8 +++ b/UBI/15/Dockerfile.postgis-multilang.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="15.8" \ - release="20" \ + version="15.10" \ + 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." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ pg_failover_slots_15 \ pg_squeeze_15 \ "$pg_audit_pkg" \ pgvector_15 \ + wal2json_15 \ ; \ 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='*' @@ -91,7 +92,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_15-3.4.2 \ pgrouting_15 \ ; \ diff --git a/UBI/15/Dockerfile.postgis-multilang.ubi9 b/UBI/15/Dockerfile.postgis-multilang.ubi9 index 8fac3517..dc296a8e 100644 --- a/UBI/15/Dockerfile.postgis-multilang.ubi9 +++ b/UBI/15/Dockerfile.postgis-multilang.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="15.8" \ - release="21" \ + version="15.10" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ pg_failover_slots_15 \ pg_squeeze_15 \ "$pg_audit_pkg" \ pgvector_15 \ + wal2json_15 \ ; \ 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='*' @@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_15-3.4.2 \ pgrouting_15 \ ; \ diff --git a/UBI/15/Dockerfile.postgis.ubi8 b/UBI/15/Dockerfile.postgis.ubi8 index afa01ea3..8d01f491 100644 --- a/UBI/15/Dockerfile.postgis.ubi8 +++ b/UBI/15/Dockerfile.postgis.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="15.8" \ - release="20" \ + version="15.10" \ + 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." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ pg_failover_slots_15 \ pg_squeeze_15 \ "$pg_audit_pkg" \ pgvector_15 \ + wal2json_15 \ ; \ 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='*' @@ -90,7 +91,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_15-3.4.2 \ pgrouting_15 \ ; \ diff --git a/UBI/15/Dockerfile.postgis.ubi9 b/UBI/15/Dockerfile.postgis.ubi9 index bac0e965..e03acbf6 100644 --- a/UBI/15/Dockerfile.postgis.ubi9 +++ b/UBI/15/Dockerfile.postgis.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="15.8" \ - release="21" \ + version="15.10" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql15-15.8 \ - postgresql15-contrib-15.8 \ - postgresql15-server-15.8 \ - postgresql15-libs-15.8 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql15-15.10 \ + postgresql15-contrib-15.10 \ + postgresql15-server-15.10 \ + postgresql15-libs-15.10 \ pg_failover_slots_15 \ pg_squeeze_15 \ "$pg_audit_pkg" \ pgvector_15 \ + wal2json_15 \ ; \ 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='*' @@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_15-3.4.2 \ pgrouting_15 \ ; \ diff --git a/UBI/15/Dockerfile.ubi8 b/UBI/15/Dockerfile.ubi8 index 33e8c167..5d59365c 100644 --- a/UBI/15/Dockerfile.ubi8 +++ b/UBI/15/Dockerfile.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/Dockerfile.ubi9 b/UBI/15/Dockerfile.ubi9 index e0b650fa..450eebf2 100644 --- a/UBI/15/Dockerfile.ubi9 +++ b/UBI/15/Dockerfile.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="15.10" \ - 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/15/root/requirements.txt b/UBI/15/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/15/root/requirements.txt +++ b/UBI/15/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/16/.versions-postgis-ubi8.json b/UBI/16/.versions-postgis-ubi8.json index 604cb65f..5911d8ae 100644 --- a/UBI/16/.versions-postgis-ubi8.json +++ b/UBI/16/.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": "16.4", - "UBI_VERSION": "8.10-1054" + "POSTGRES_VERSION": "16.6", + "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/16/.versions-postgis-ubi9.json b/UBI/16/.versions-postgis-ubi9.json index 491d87dd..e85a2156 100644 --- a/UBI/16/.versions-postgis-ubi9.json +++ b/UBI/16/.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": "16.4", - "UBI_VERSION": "9.4-1214" + "POSTGRES_VERSION": "16.6", + "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/16/.versions-ubi8.json b/UBI/16/.versions-ubi8.json index 7c140368..6c7bd135 100644 --- a/UBI/16/.versions-ubi8.json +++ b/UBI/16/.versions-ubi8.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "16.6", "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/16/.versions-ubi9.json b/UBI/16/.versions-ubi9.json index 4372c396..a41b9ea5 100644 --- a/UBI/16/.versions-ubi9.json +++ b/UBI/16/.versions-ubi9.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "16.6", "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/16/Dockerfile.multiarch.ubi8 b/UBI/16/Dockerfile.multiarch.ubi8 index de67d327..4bd7db91 100644 --- a/UBI/16/Dockerfile.multiarch.ubi8 +++ b/UBI/16/Dockerfile.multiarch.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.multiarch.ubi9 b/UBI/16/Dockerfile.multiarch.ubi9 index df98cf0d..8945dacf 100644 --- a/UBI/16/Dockerfile.multiarch.ubi9 +++ b/UBI/16/Dockerfile.multiarch.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.multilang.ubi8 b/UBI/16/Dockerfile.multilang.ubi8 index 69fc0c49..c8c2cdd6 100644 --- a/UBI/16/Dockerfile.multilang.ubi8 +++ b/UBI/16/Dockerfile.multilang.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.multilang.ubi9 b/UBI/16/Dockerfile.multilang.ubi9 index 2f0e68f7..5a832bc9 100644 --- a/UBI/16/Dockerfile.multilang.ubi9 +++ b/UBI/16/Dockerfile.multilang.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.plv8.ubi8 b/UBI/16/Dockerfile.plv8.ubi8 index 12dabd51..1c2094c4 100644 --- a/UBI/16/Dockerfile.plv8.ubi8 +++ b/UBI/16/Dockerfile.plv8.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.plv8.ubi9 b/UBI/16/Dockerfile.plv8.ubi9 index 6d9d9d1c..6a55b9a6 100644 --- a/UBI/16/Dockerfile.plv8.ubi9 +++ b/UBI/16/Dockerfile.plv8.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.postgis-multiarch.ubi8 b/UBI/16/Dockerfile.postgis-multiarch.ubi8 index cdb1633c..273caef5 100644 --- a/UBI/16/Dockerfile.postgis-multiarch.ubi8 +++ b/UBI/16/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="16.4" \ - release="20" \ + version="16.6" \ + 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_16" ; \ pgvector="pgvector_16" ; \ pg_audit_pkg="pgaudit18_16" ; \ + wal2json_pkg="wal2json_16" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \ pgvector="edb-pg16-pgvector0" ; \ pg_audit_pkg="edb-pg16-pgaudit1" ; \ + wal2json_pkg="edb-pg16-wal2json2" ; \ if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \ pgvector="edb-pg16-pgvector0" ; \ pg_audit_pkg="edb-pg16-pgaudit1" ; \ + wal2json_pkg="edb-pg16-wal2json2" ; \ if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + 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 \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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_16-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/16/Dockerfile.postgis-multiarch.ubi9 b/UBI/16/Dockerfile.postgis-multiarch.ubi9 index 16e9a5d6..d77c6a64 100644 --- a/UBI/16/Dockerfile.postgis-multiarch.ubi9 +++ b/UBI/16/Dockerfile.postgis-multiarch.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="16.4" \ - release="21" \ + version="16.6" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="pg_squeeze_16" ; \ pgvector="pgvector_16" ; \ pg_audit_pkg="pgaudit18_16" ; \ + wal2json_pkg="wal2json_16" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \ pgvector="edb-pg16-pgvector0" ; \ pg_audit_pkg="edb-pg16-pgaudit1" ; \ + wal2json_pkg="edb-pg16-wal2json2" ; \ if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg16-pg-squeeze1" ; \ pgvector="edb-pg16-pgvector0" ; \ pg_audit_pkg="edb-pg16-pgaudit1" ; \ + wal2json_pkg="edb-pg16-wal2json2" ; \ if [ "16" -gt "15" ]; then pg_audit_pkg="edb-pg16-pgaudit16"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + 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 \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_16-3.4.2 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/16/Dockerfile.postgis-multilang.ubi8 b/UBI/16/Dockerfile.postgis-multilang.ubi8 index aa4cbfc7..4a127530 100644 --- a/UBI/16/Dockerfile.postgis-multilang.ubi8 +++ b/UBI/16/Dockerfile.postgis-multilang.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="16.4" \ - release="20" \ + version="16.6" \ + 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." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ pg_failover_slots_16 \ pg_squeeze_16 \ "$pg_audit_pkg" \ pgvector_16 \ + wal2json_16 \ ; \ 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='*' @@ -91,7 +92,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_16-3.4.2 \ pgrouting_16 \ ; \ diff --git a/UBI/16/Dockerfile.postgis-multilang.ubi9 b/UBI/16/Dockerfile.postgis-multilang.ubi9 index f5afc4ad..84422d16 100644 --- a/UBI/16/Dockerfile.postgis-multilang.ubi9 +++ b/UBI/16/Dockerfile.postgis-multilang.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="16.4" \ - release="21" \ + version="16.6" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ pg_failover_slots_16 \ pg_squeeze_16 \ "$pg_audit_pkg" \ pgvector_16 \ + wal2json_16 \ ; \ 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='*' @@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_16-3.4.2 \ pgrouting_16 \ ; \ diff --git a/UBI/16/Dockerfile.postgis.ubi8 b/UBI/16/Dockerfile.postgis.ubi8 index 6a46bda2..97619817 100644 --- a/UBI/16/Dockerfile.postgis.ubi8 +++ b/UBI/16/Dockerfile.postgis.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="16.4" \ - release="20" \ + version="16.6" \ + 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." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ pg_failover_slots_16 \ pg_squeeze_16 \ "$pg_audit_pkg" \ pgvector_16 \ + wal2json_16 \ ; \ 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='*' @@ -90,7 +91,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_16-3.4.2 \ pgrouting_16 \ ; \ diff --git a/UBI/16/Dockerfile.postgis.ubi9 b/UBI/16/Dockerfile.postgis.ubi9 index 5b3e29fb..213182f2 100644 --- a/UBI/16/Dockerfile.postgis.ubi9 +++ b/UBI/16/Dockerfile.postgis.ubi9 @@ -1,13 +1,13 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="16.4" \ - release="21" \ + version="16.6" \ + release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql16-16.4 \ - postgresql16-contrib-16.4 \ - postgresql16-server-16.4 \ - postgresql16-libs-16.4 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql16-16.6 \ + postgresql16-contrib-16.6 \ + postgresql16-server-16.6 \ + postgresql16-libs-16.6 \ pg_failover_slots_16 \ pg_squeeze_16 \ "$pg_audit_pkg" \ pgvector_16 \ + wal2json_16 \ ; \ 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='*' @@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis34_16-3.4.2 \ pgrouting_16 \ ; \ diff --git a/UBI/16/Dockerfile.ubi8 b/UBI/16/Dockerfile.ubi8 index 6dc212c4..e2b38946 100644 --- a/UBI/16/Dockerfile.ubi8 +++ b/UBI/16/Dockerfile.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/Dockerfile.ubi9 b/UBI/16/Dockerfile.ubi9 index da67521a..4fc3dcb9 100644 --- a/UBI/16/Dockerfile.ubi9 +++ b/UBI/16/Dockerfile.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="16.6" \ - 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/16/root/requirements.txt b/UBI/16/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/16/root/requirements.txt +++ b/UBI/16/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/17/.versions-postgis-ubi8.json b/UBI/17/.versions-postgis-ubi8.json index 9f8ff009..85d1c3ad 100644 --- a/UBI/17/.versions-postgis-ubi8.json +++ b/UBI/17/.versions-postgis-ubi8.json @@ -2,6 +2,6 @@ "BARMAN_VERSION": "3.11.1", "IMAGE_RELEASE_VERSION": "1", "POSTGIS_VERSION": "3.5.0", - "POSTGRES_VERSION": "17.0", - "UBI_VERSION": "8.10-1088" + "POSTGRES_VERSION": "17.2", + "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/17/.versions-postgis-ubi9.json b/UBI/17/.versions-postgis-ubi9.json index 3fad505b..6427345b 100644 --- a/UBI/17/.versions-postgis-ubi9.json +++ b/UBI/17/.versions-postgis-ubi9.json @@ -2,6 +2,6 @@ "BARMAN_VERSION": "3.11.1", "IMAGE_RELEASE_VERSION": "1", "POSTGIS_VERSION": "3.5.0", - "POSTGRES_VERSION": "17.0", - "UBI_VERSION": "9.4-1214.1726694543" + "POSTGRES_VERSION": "17.2", + "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/17/.versions-ubi8.json b/UBI/17/.versions-ubi8.json index 55881a11..61b48363 100644 --- a/UBI/17/.versions-ubi8.json +++ b/UBI/17/.versions-ubi8.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "17.2", "UBI_VERSION": "8.10-1132.1731461736" } diff --git a/UBI/17/.versions-ubi9.json b/UBI/17/.versions-ubi9.json index 508cc1af..428748b9 100644 --- a/UBI/17/.versions-ubi9.json +++ b/UBI/17/.versions-ubi9.json @@ -1,6 +1,6 @@ { "BARMAN_VERSION": "3.11.1", - "IMAGE_RELEASE_VERSION": "4", + "IMAGE_RELEASE_VERSION": "5", "POSTGRES_VERSION": "17.2", "UBI_VERSION": "9.5-1731517889" } diff --git a/UBI/17/Dockerfile.multiarch.ubi8 b/UBI/17/Dockerfile.multiarch.ubi8 index a61f3eeb..ade9e9b2 100644 --- a/UBI/17/Dockerfile.multiarch.ubi8 +++ b/UBI/17/Dockerfile.multiarch.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.multiarch.ubi9 b/UBI/17/Dockerfile.multiarch.ubi9 index 9a280b33..573c58ab 100644 --- a/UBI/17/Dockerfile.multiarch.ubi9 +++ b/UBI/17/Dockerfile.multiarch.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.multilang.ubi8 b/UBI/17/Dockerfile.multilang.ubi8 index 1f8f9ce5..6000ad51 100644 --- a/UBI/17/Dockerfile.multilang.ubi8 +++ b/UBI/17/Dockerfile.multilang.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.multilang.ubi9 b/UBI/17/Dockerfile.multilang.ubi9 index 506417db..a46b9a1d 100644 --- a/UBI/17/Dockerfile.multilang.ubi9 +++ b/UBI/17/Dockerfile.multilang.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.plv8.ubi8 b/UBI/17/Dockerfile.plv8.ubi8 index 94e57bbc..792d8ce9 100644 --- a/UBI/17/Dockerfile.plv8.ubi8 +++ b/UBI/17/Dockerfile.plv8.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.plv8.ubi9 b/UBI/17/Dockerfile.plv8.ubi9 index 5a19b86d..d02ff830 100644 --- a/UBI/17/Dockerfile.plv8.ubi9 +++ b/UBI/17/Dockerfile.plv8.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.postgis-multiarch.ubi8 b/UBI/17/Dockerfile.postgis-multiarch.ubi8 index 6f96daf6..21646578 100644 --- a/UBI/17/Dockerfile.postgis-multiarch.ubi8 +++ b/UBI/17/Dockerfile.postgis-multiarch.ubi8 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:8.10-1088 +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="17.0" \ + version="17.2" \ 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_17" ; \ pgvector="pgvector_17" ; \ pg_audit_pkg="pgaudit19_17" ; \ + wal2json_pkg="wal2json_17" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \ pgvector="edb-pg17-pgvector0" ; \ pg_audit_pkg="edb-pg17-pgaudit1" ; \ + wal2json_pkg="edb-pg17-wal2json2" ; \ if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \ pgvector="edb-pg17-pgvector0" ; \ pg_audit_pkg="edb-pg17-pgaudit1" ; \ + wal2json_pkg="edb-pg17-wal2json2" ; \ if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + 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 \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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 \ postgis35_17-3.5.0 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/17/Dockerfile.postgis-multiarch.ubi9 b/UBI/17/Dockerfile.postgis-multiarch.ubi9 index fb267208..7700ac4f 100644 --- a/UBI/17/Dockerfile.postgis-multiarch.ubi9 +++ b/UBI/17/Dockerfile.postgis-multiarch.ubi9 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="17.0" \ + version="17.2" \ release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -22,6 +22,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="pg_squeeze_17" ; \ pgvector="pgvector_17" ; \ pg_audit_pkg="pgaudit19_17" ; \ + wal2json_pkg="wal2json_17" ; \ case $ARCH in \ amd64) \ yum -y install "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ; \ @@ -37,6 +38,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \ pgvector="edb-pg17-pgvector0" ; \ pg_audit_pkg="edb-pg17-pgaudit1" ; \ + wal2json_pkg="edb-pg17-wal2json2" ; \ if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \ s390x) \ curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \ @@ -44,6 +46,7 @@ RUN --mount=type=secret,id=cs_token \ pg_squeeze_pkg="edb-pg17-pg-squeeze1" ; \ pgvector="edb-pg17-pgvector0" ; \ pg_audit_pkg="edb-pg17-pgaudit1" ; \ + wal2json_pkg="edb-pg17-wal2json2" ; \ if [ "17" -gt "15" ]; then pg_audit_pkg="edb-pg17-pgaudit17"; fi ;; \ *) \ exit 1 ;; \ @@ -51,16 +54,17 @@ RUN --mount=type=secret,id=cs_token \ 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 \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + 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 \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ "$pg_audit_pkg" \ "$pg_squeeze_pkg" \ "$pg_failover_slots_pkg" \ "$pgvector" \ + "$wal2json_pkg" \ ; \ rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \ rm -fr /tmp/* ; \ @@ -68,7 +72,7 @@ RUN --mount=type=secret,id=cs_token \ # 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-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis35_17-3.5.0 \ "$pgrouting_pkg" \ ; \ diff --git a/UBI/17/Dockerfile.postgis-multilang.ubi8 b/UBI/17/Dockerfile.postgis-multilang.ubi8 index 0456ec4f..c2f9c4c7 100644 --- a/UBI/17/Dockerfile.postgis-multilang.ubi8 +++ b/UBI/17/Dockerfile.postgis-multilang.ubi8 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:8.10-1088 +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="17.0" \ + version="17.2" \ 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." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ pg_failover_slots_17 \ pg_squeeze_17 \ "$pg_audit_pkg" \ pgvector_17 \ + wal2json_17 \ ; \ 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='*' @@ -91,7 +92,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 \ postgis35_17-3.5.0 \ pgrouting_17 \ ; \ diff --git a/UBI/17/Dockerfile.postgis-multilang.ubi9 b/UBI/17/Dockerfile.postgis-multilang.ubi9 index fd612b55..9958e975 100644 --- a/UBI/17/Dockerfile.postgis-multilang.ubi9 +++ b/UBI/17/Dockerfile.postgis-multilang.ubi9 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="17.0" \ + version="17.2" \ release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -31,23 +31,24 @@ RUN set -xe ; \ 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 \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + yum -y --setopt=install_weak_deps=0 install 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 \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ pg_failover_slots_17 \ pg_squeeze_17 \ "$pg_audit_pkg" \ pgvector_17 \ + wal2json_17 \ ; \ 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='*' @@ -91,7 +92,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis35_17-3.5.0 \ pgrouting_17 \ ; \ diff --git a/UBI/17/Dockerfile.postgis.ubi8 b/UBI/17/Dockerfile.postgis.ubi8 index 4d3db095..e12d82e1 100644 --- a/UBI/17/Dockerfile.postgis.ubi8 +++ b/UBI/17/Dockerfile.postgis.ubi8 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:8.10-1088 +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="17.0" \ + version="17.2" \ 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." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ pg_failover_slots_17 \ pg_squeeze_17 \ "$pg_audit_pkg" \ pgvector_17 \ + wal2json_17 \ ; \ 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='*' @@ -90,7 +91,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 \ postgis35_17-3.5.0 \ pgrouting_17 \ ; \ diff --git a/UBI/17/Dockerfile.postgis.ubi9 b/UBI/17/Dockerfile.postgis.ubi9 index d6c935c7..f492d670 100644 --- a/UBI/17/Dockerfile.postgis.ubi9 +++ b/UBI/17/Dockerfile.postgis.ubi9 @@ -1,12 +1,12 @@ # vim:set ft=dockerfile: -FROM quay.io/enterprisedb/edb-ubi:9.4-1214.1726694543 +FROM quay.io/enterprisedb/edb-ubi:9.5-1731517889 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="17.0" \ + version="17.2" \ release="1" \ summary="PostgreSQL + PostGIS Container images." \ description="This Docker image contains PostgreSQL, PostGIS and Barman Cloud based on RedHat Universal Base Images (UBI) 9." @@ -30,23 +30,24 @@ RUN set -xe ; \ esac ; \ yum -y upgrade glibc-common ; \ yum -y reinstall glibc-common ; \ - yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ - yum -y --setopt=tsflags=nodocs install \ - postgresql17-17.0 \ - postgresql17-contrib-17.0 \ - postgresql17-server-17.0 \ - postgresql17-libs-17.0 \ + yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en ; \ + yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \ + postgresql17-17.2 \ + postgresql17-contrib-17.2 \ + postgresql17-server-17.2 \ + postgresql17-libs-17.2 \ pg_failover_slots_17 \ pg_squeeze_17 \ "$pg_audit_pkg" \ pgvector_17 \ + wal2json_17 \ ; \ 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='*' @@ -90,7 +91,8 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \ *) \ exit 1 ;; \ esac ; \ - yum -y install --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ + yum -y install --setopt=install_weak_deps=0 \ + --enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \ postgis35_17-3.5.0 \ pgrouting_17 \ ; \ diff --git a/UBI/17/Dockerfile.ubi8 b/UBI/17/Dockerfile.ubi8 index dc6a018d..409346ff 100644 --- a/UBI/17/Dockerfile.ubi8 +++ b/UBI/17/Dockerfile.ubi8 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/Dockerfile.ubi9 b/UBI/17/Dockerfile.ubi9 index 9830f7f8..bee9d9b9 100644 --- a/UBI/17/Dockerfile.ubi9 +++ b/UBI/17/Dockerfile.ubi9 @@ -6,7 +6,7 @@ LABEL name="PostgreSQL Container Images" \ vendor="EnterpriseDB" \ url="https://www.enterprisedb.com/" \ version="17.2" \ - 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/17/root/requirements.txt b/UBI/17/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/17/root/requirements.txt +++ b/UBI/17/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/src/root/requirements.txt b/UBI/src/root/requirements.txt index ab09bf71..8fbd1ddc 100644 --- a/UBI/src/root/requirements.txt +++ b/UBI/src/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