diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 786a6119a..59ec93295 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -44,7 +44,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 2f43acd28..c2c7aca18 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 6ac345593..945c8dd01 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 4839e5916..a0a92b841 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 72b8c0494..cc14b756c 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -53,8 +53,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 9ef6a9c37..e9cce3ce2 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -56,7 +56,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ openssl-libs \ pcre2 \ postgresql \ - postgresql-libs \ + postgresql-private-libs \ shadow-utils \ zlib \ gzip \ @@ -68,6 +68,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 79f3af51a..d9614aca4 100644 --- a/Dockerfiles/server-pgsql/ol/Dockerfile +++ b/Dockerfiles/server-pgsql/ol/Dockerfile @@ -55,10 +55,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 b2b47ae7e..cea5db0db 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 226817191..e4ca87f17 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -51,7 +51,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 44a3e1097..f27dbe735 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -57,6 +57,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 df7301d92..227daf8a7 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -50,6 +50,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 06bbed68e..51b46faef 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -51,7 +51,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 e0905931c..be03e7814 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -55,6 +55,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 c38519a32..e44d673d5 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -48,6 +48,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 fadb69c95..fdd8e2ea7 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -72,6 +72,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" \