diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index d134ec3c9..8f344ccfb 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ openssl-dev \ patch \ pcre2-dev \ - postgresql-dev \ + libpq-dev \ gettext \ git \ g++ \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 98daa5c63..ecc492993 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -39,7 +39,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ OpenIPMI-devel \ openldap-devel \ sqlite-devel \ - postgresql-devel \ + postgresql-private-devel \ + postgresql-server-devel \ java-17-openjdk-devel \ git \ gettext \ @@ -53,6 +54,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 0e404a5a7..310a3a8b5 100644 --- a/Dockerfiles/build-base/ol/Dockerfile +++ b/Dockerfiles/build-base/ol/Dockerfile @@ -41,12 +41,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ OpenIPMI-devel \ openldap-devel \ sqlite-devel \ + postgresql-private-devel \ postgresql-server-devel \ java-17-openjdk-devel \ git \ gettext \ unixODBC-devel \ zlib-devel" && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "ol9_appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ol9_baseos_latest" \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index ff3da5fa0..3f45d3429 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -52,7 +52,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ OpenIPMI-devel \ openldap-devel \ sqlite-devel \ - postgresql-devel \ + postgresql-private-devel \ + postgresql-server-devel \ java-17-openjdk-devel \ git \ gettext \ @@ -62,6 +63,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ ARCH_SUFFIX="$(arch)"; \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 57d74f515..98894deca 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -54,8 +54,7 @@ RUN set -eux && \ net-snmp-agent-libs \ openipmi-libs \ pcre2 \ - postgresql-client \ - postgresql-libs \ + postgresql16-client \ gzip \ unixodbc \ zlib" && \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 9ee5f98f5..4d760484f 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -57,7 +57,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl-libs \ pcre2 \ postgresql \ - postgresql-libs \ + postgresql-private-libs \ shadow-utils \ zlib \ gzip \ @@ -69,6 +69,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index bcce8ddad..9d5cecf97 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -56,10 +56,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl-libs \ pcre2 \ postgresql \ - postgresql-libs \ + postgresql-private-libs \ zlib \ gzip \ unixODBC" && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "ol9_baseos_latest" \ + --enablerepo "ol9_appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 5ecebcad9..f6d1555f6 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -77,7 +77,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ OpenIPMI-libs \ pcre2 \ postgresql \ - postgresql-libs \ + postgresql-private-libs \ gzip \ unixODBC \ zlib" && \ @@ -85,6 +85,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ ARCH_SUFFIX="$(arch)"; \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 583940b80..790586803 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ php83-xmlreader \ php83-xmlwriter \ php83-openssl \ - postgresql-client" && \ + postgresql16-client" && \ apk add \ --no-cache \ --clean-protected \ diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 9b597435c..c87ad6478 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -56,6 +56,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index ef0773be5..2abba1f1b 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -49,6 +49,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ findutils \ glibc-locale-source \ supervisor" && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "ol9_baseos_latest" \ + --enablerepo "ol9_appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 456f653e6..3d24a7c3d 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -50,7 +50,7 @@ RUN set -eux && \ php83-xmlreader \ php83-xmlwriter \ php83-openssl \ - postgresql-client \ + postgresql16-client \ supervisor" && \ apk add \ --no-cache \ diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 1c610f647..a29e01995 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -54,6 +54,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index c6ba4b6cb..fe3ddc174 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -47,6 +47,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ php-xml \ postgresql \ supervisor" && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "ol9_baseos_latest" \ + --enablerepo "ol9_appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index fa6de020d..7627bb4b1 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -71,6 +71,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ ARCH_SUFFIX="$(arch)"; \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \