Skip to content

Commit

Permalink
Daily automatic update
Browse files Browse the repository at this point in the history
  • Loading branch information
EnterpriseDB Automated Updates committed Nov 27, 2024
1 parent b0c4285 commit 4a91451
Show file tree
Hide file tree
Showing 46 changed files with 448 additions and 358 deletions.
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis-multiarch.ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
"$pgrouting_pkg" \
; \
Expand Down
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis-multiarch.ubi9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
"$pgrouting_pkg" \
; \
Expand Down
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis-multilang.ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
pgrouting_12 \
; \
Expand Down
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis-multilang.ubi9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
pgrouting_12 \
; \
Expand Down
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis.ubi8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-8-codeready-builder,codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
pgrouting_12 \
; \
Expand Down
2 changes: 1 addition & 1 deletion UBI/12/Dockerfile.postgis.ubi9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ RUN --mount=type=secret,id=subscription,target=/run/secrets/subscription.sh \
exit 1 ;; \
esac ; \
yum -y install --setopt=install_weak_deps=0 \
--enablerepo=ubi-9-codeready-builder,codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
--enablerepo=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
postgis34_12-3.4.3 \
pgrouting_12 \
; \
Expand Down
6 changes: 3 additions & 3 deletions UBI/13/.versions-postgis-ubi8.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions UBI/13/.versions-postgis-ubi9.json
View file
Original file line number Diff line number Diff line change
@@ -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"
}
27 changes: 16 additions & 11 deletions UBI/13/Dockerfile.postgis-multiarch.ubi8
View file
Original file line number Diff line number Diff line change
@@ -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."

Expand All @@ -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" ; \
Expand All @@ -37,38 +38,41 @@ RUN --mount=type=secret,id=cs_token \
pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
pgvector="edb-pg13-pgvector0" ; \
pg_audit_pkg="edb-pg13-pgaudit1" ; \
wal2json_pkg="edb-pg13-wal2json2" ; \
if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
s390x) \
curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
pg_failover_slots_pkg="edb-pg13-pg-failover-slots1" ; \
pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
pgvector="edb-pg13-pgvector0" ; \
pg_audit_pkg="edb-pg13-pgaudit1" ; \
wal2json_pkg="edb-pg13-wal2json2" ; \
if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
*) \
exit 1 ;; \
esac ; \
yum -y upgrade glibc-common ; \
yum -y reinstall glibc-common ; \
rm -fr /etc/rpm/macros.image-language-conf ; \
yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
yum -y --setopt=tsflags=nodocs install \
postgresql13-13.16 \
postgresql13-contrib-13.16 \
postgresql13-server-13.16 \
postgresql13-libs-13.16 \
yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
postgresql13-13.18 \
postgresql13-contrib-13.18 \
postgresql13-server-13.18 \
postgresql13-libs-13.18 \
"$pg_audit_pkg" \
"$pg_squeeze_pkg" \
"$pg_failover_slots_pkg" \
"$pgvector" \
"$wal2json_pkg" \
; \
rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
rm -fr /tmp/* ; \
yum -y clean all --enablerepo='*'

# Install barman-cloud
RUN set -xe ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'
Expand Down Expand Up @@ -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=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
postgis34_13-3.4.2 \
"$pgrouting_pkg" \
; \
Expand Down
27 changes: 16 additions & 11 deletions UBI/13/Dockerfile.postgis-multiarch.ubi9
View file
Original file line number Diff line number Diff line change
@@ -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."

Expand All @@ -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" ; \
Expand All @@ -37,38 +38,41 @@ RUN --mount=type=secret,id=cs_token \
pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
pgvector="edb-pg13-pgvector0" ; \
pg_audit_pkg="edb-pg13-pgaudit1" ; \
wal2json_pkg="edb-pg13-wal2json2" ; \
if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
s390x) \
curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ; \
pg_failover_slots_pkg="edb-pg13-pg-failover-slots1" ; \
pg_squeeze_pkg="edb-pg13-pg-squeeze1" ; \
pgvector="edb-pg13-pgvector0" ; \
pg_audit_pkg="edb-pg13-pgaudit1" ; \
wal2json_pkg="edb-pg13-wal2json2" ; \
if [ "13" -gt "15" ]; then pg_audit_pkg="edb-pg13-pgaudit13"; fi ;; \
*) \
exit 1 ;; \
esac ; \
yum -y upgrade glibc-common ; \
yum -y reinstall glibc-common ; \
rm -fr /etc/rpm/macros.image-language-conf ; \
yum -y install hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
yum -y --setopt=tsflags=nodocs install \
postgresql13-13.16 \
postgresql13-contrib-13.16 \
postgresql13-server-13.16 \
postgresql13-libs-13.16 \
yum -y install --setopt=install_weak_deps=0 hostname rsync tar gettext bind-utils nss_wrapper glibc-locale-source glibc-langpack-en glibc-all-langpacks ; \
yum -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install \
postgresql13-13.18 \
postgresql13-contrib-13.18 \
postgresql13-server-13.18 \
postgresql13-libs-13.18 \
"$pg_audit_pkg" \
"$pg_squeeze_pkg" \
"$pg_failover_slots_pkg" \
"$pgvector" \
"$wal2json_pkg" \
; \
rm -fr /etc/yum.repos.d/enterprisedb-*.repo ; \
rm -fr /tmp/* ; \
yum -y clean all --enablerepo='*'

# Install barman-cloud
RUN set -xe ; \
yum -y install python3.11-pip python3.11-psycopg2 ; \
yum -y install --setopt=install_weak_deps=0 python3.11-pip python3.11-psycopg2 ; \
pip3.11 install --upgrade pip ; \
pip3.11 install -r requirements.txt ; \
yum -y clean all --enablerepo='*'
Expand Down Expand Up @@ -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=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
postgis34_13-3.4.2 \
"$pgrouting_pkg" \
; \
Expand Down
24 changes: 13 additions & 11 deletions UBI/13/Dockerfile.postgis-multilang.ubi8
View file
Original file line number Diff line number Diff line change
@@ -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."

Expand All @@ -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='*'
Expand Down Expand Up @@ -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=codeready-builder-for-rhel-8-${BUILDARCH}-rpms \
postgis34_13-3.4.2 \
pgrouting_13 \
; \
Expand Down
24 changes: 13 additions & 11 deletions UBI/13/Dockerfile.postgis-multilang.ubi9
View file
Original file line number Diff line number Diff line change
@@ -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."

Expand All @@ -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='*'
Expand Down Expand Up @@ -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=codeready-builder-for-rhel-9-${BUILDARCH}-rpms \
postgis34_13-3.4.2 \
pgrouting_13 \
; \
Expand Down
Loading

0 comments on commit 4a91451

Please sign in to comment.