Updated PostgreSQL libs to 16 version

2025-01-23 13:58:47 +01:00 · 2024-05-10 19:24:20 +09:00 · 2024-05-10 19:24:20 +09:00 · c9721853fb
commit c9721853fb
parent 6edbad4d40
13 changed files with 119 additions and 35 deletions
--- 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++ \
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@ -39,20 +39,27 @@ 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 \
            go-toolset \
            unixODBC-devel \
            zlib-devel" && \
-    dnf -y module enable mysql && \
    dnf -y install \
        --disablerepo "*" \
        --enablerepo "extras" \
        --setopt=tsflags=nodocs \
        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
        --best epel-release && \
+    dnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        postgresql:16 mysql && \
    dnf -y install \
        --disablerepo "*" \
        --enablerepo "${REPOLIST}" \
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@ -41,14 +41,19 @@ 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 \
            unixODBC-devel \
            zlib-devel" && \
-    microdnf -y module enable mysql && \
-    microdnf module enable postgresql:15 && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol8_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 mysql && \
    microdnf -y install \
        --disablerepo "*" \
        --enablerepo "ol8_baseos_latest" \
--- a/Dockerfiles/build-base/rhel/Dockerfile
+++ b/Dockerfiles/build-base/rhel/Dockerfile
@ -51,7 +51,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 \
@ -60,7 +61,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
    curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -o /tmp/epel-release-latest-8.noarch.rpm && \
    rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \
    rm -rf /tmp/epel-release-latest-8.noarch.rpm && \
-    microdnf -y module enable mysql && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "rhel-8-for-x86_64-baseos-rpms" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 mysql && \
    microdnf -y install \
            --disablerepo "*" \
            --enablerepo "ubi-8-baseos-rpms" \
--- a/Dockerfiles/server-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/server-pgsql/alpine/Dockerfile
@ -52,8 +52,7 @@ RUN set -eux && \
            net-snmp-agent-libs \
            openipmi-libs \
            pcre2 \
-            postgresql-client \
-            postgresql-libs \
+            postgresql16-client \
            gzip \
            unixodbc \
            zlib" && \
--- a/Dockerfiles/server-pgsql/centos/Dockerfile
+++ b/Dockerfiles/server-pgsql/centos/Dockerfile
@ -54,18 +54,31 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            openssl-libs \
            pcre2 \
            postgresql \
-            postgresql-libs \
+            postgresql-private-libs \
            zlib \
            gzip \
            unixODBC" && \
-    dnf -y install epel-release && \
    dnf -y install \
-            --disablerepo "*" \
-            --enablerepo "${REPOLIST}" \
-            --setopt=tsflags=nodocs \
-            --setopt=install_weak_deps=False \
-            --best \
-        ${INSTALL_PKGS} && \
+        --disablerepo "*" \
+        --enablerepo "extras" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        --best epel-release && \
+    dnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=tsflags=nodocs \ 
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 && \
+    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "${REPOLIST}" \
+        --setopt=tsflags=nodocs \ 
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        --best ${INSTALL_PKGS} && \
    dnf -y reinstall \
            --disablerepo "*" \
            --enablerepo "baseos" \
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@ -55,10 +55,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            openssl-libs \
            pcre2 \
            postgresql \
-            postgresql-libs \
+            postgresql-private-libs \
            zlib \
            unixODBC" && \
-    microdnf module enable postgresql:15 && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol8_baseos_latest" \
+        --enablerepo "ol8_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \
--- 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 \
--- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile
@ -49,16 +49,35 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            findutils \
            glibc-locale-source \
            supervisor" && \
-    dnf -y install epel-release && \
-    dnf -y module enable php:8.0 && \
    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "extras" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        --best epel-release && \
+    dnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        postgresql:16 php:8.2 && \
+    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "${REPOLIST}" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        --best ${INSTALL_PKGS} && \
+    dnf -y reinstall \
            --disablerepo "*" \
-            --enablerepo "${REPOLIST}" \
+            --enablerepo "baseos" \
            --setopt=tsflags=nodocs \
            --setopt=install_weak_deps=False \
-            --setopt=keepcache=0 \
+            --setopt=keepcache=False \
            --best \
-        ${INSTALL_PKGS} && \
+        tzdata && \
    groupadd \
            --system \
            --gid 1995 \
--- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
@ -49,8 +49,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            findutils \
            glibc-locale-source \
            supervisor" && \
-    microdnf -y module enable php:8.0 && \
-    microdnf module enable postgresql:15 && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol8_baseos_latest" \
+        --enablerepo "ol8_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 php:8.2 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \
--- 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 \
--- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile
@ -47,15 +47,34 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            php-xml \
            postgresql \
            supervisor" && \
-    dnf -y install epel-release && \
-    dnf -y module enable php:8.2 nginx:1.24 && \
    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "extras" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        --best epel-release && \
+    dnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "appstream" \
+        --setopt=tsflags=nodocs \
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=False \
+        postgresql:16 php:8.2 nginx:1.24 && \
+    dnf -y install \
+        --disablerepo "*" \
+        --enablerepo "${REPOLIST}" \
+        --setopt=tsflags=nodocs \ 
+        --setopt=install_weak_deps=False \
+        --setopt=keepcache=0 \
+        --best ${INSTALL_PKGS} && \
+    dnf -y reinstall \
            --disablerepo "*" \
-            --enablerepo "${REPOLIST}" \
+            --enablerepo "baseos" \
            --setopt=tsflags=nodocs \
            --setopt=install_weak_deps=False \
            --best \
-        ${INSTALL_PKGS} && \
+        tzdata && \
    groupadd \
            --system \
            --gid 1995 \
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@ -47,8 +47,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            php-xml \
            postgresql \
            supervisor" && \
-    microdnf -y module enable php:8.2 nginx:1.24 && \
-    microdnf module enable postgresql:15 && \
+    microdnf -y module enable \
+        --disablerepo "*" \
+        --enablerepo "ol8_baseos_latest" \
+        --enablerepo "ol8_appstream" \
+        --setopt=install_weak_deps=0 \
+        --setopt=keepcache=0 \
+        postgresql:16 php:8.2 nginx:1.24 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \