Added zlib and devel packages. Updated PostgreSQL from 13 to 15 version

2025-06-24 20:01:43 +02:00 · 2024-03-24 22:42:53 +09:00 · 2024-03-24 22:42:53 +09:00 · a0519655a9
commit a0519655a9
parent cc6edc2a69
22 changed files with 42 additions and 23 deletions
--- a/Dockerfiles/agent/alpine/Dockerfile
+++ b/Dockerfiles/agent/alpine/Dockerfile
@ -41,7 +41,8 @@ RUN set -eux && \
            libgcc \
            libcurl \
            libmodbus \
-            libldap" && \
+            libldap \
+            zlib" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/agent/rhel/Dockerfile
+++ b/Dockerfiles/agent/rhel/Dockerfile
@ -58,7 +58,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            shadow-utils \
            pcre2 \
            libmodbus \
-            libcurl" && \
+            libcurl \
+            zlib" && \
    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 && \
--- a/Dockerfiles/agent/ubuntu/Dockerfile
+++ b/Dockerfiles/agent/ubuntu/Dockerfile
@ -42,7 +42,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            libcurl4 \
            libmodbus5 \
            libpcre2-8-0 \
-            libldap-2.4" && \
+            libldap-2.4 \
+            zlib1g" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/build-base/alpine/Dockerfile
+++ b/Dockerfiles/build-base/alpine/Dockerfile
@ -57,7 +57,8 @@ RUN set -eux && \
            go \
            make \
            $openjdk_packages \
-            unixodbc-dev" && \
+            unixodbc-dev \
+            zlib-dev" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/build-base/centos/Dockerfile
+++ b/Dockerfiles/build-base/centos/Dockerfile
@ -44,7 +44,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            git \
            gettext \
            go-toolset \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
    dnf -y module enable mysql && \
    dnf -y install \
        --disablerepo "*" \
--- a/Dockerfiles/build-base/ol/Dockerfile
+++ b/Dockerfiles/build-base/ol/Dockerfile
@ -45,9 +45,10 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            java-17-openjdk-devel \
            git \
            gettext \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
    microdnf -y module enable mysql && \
-    microdnf module enable postgresql:13 && \
+    microdnf module enable postgresql:15 && \
    microdnf -y install \
        --disablerepo "*" \
        --enablerepo "ol8_baseos_latest" \
--- a/Dockerfiles/build-base/rhel/Dockerfile
+++ b/Dockerfiles/build-base/rhel/Dockerfile
@ -55,7 +55,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            java-17-openjdk-devel \
            git \
            gettext \
-            unixODBC-devel" && \
+            unixODBC-devel \
+            zlib-devel" && \
    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 && \
--- a/Dockerfiles/build-base/ubuntu/Dockerfile
+++ b/Dockerfiles/build-base/ubuntu/Dockerfile
@ -46,7 +46,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            git \
            golang-1.21 \
            unzip \
-            unixodbc-dev" && \
+            unixodbc-dev \
+            zlib1g-dev" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/proxy-mysql/alpine/Dockerfile
+++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile
@ -54,7 +54,8 @@ RUN set -eux && \
            pcre2 \
            unixodbc \
            gzip \
-            fping" && \
+            fping \
+            zlib" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/proxy-mysql/rhel/Dockerfile
+++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile
@ -73,7 +73,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            OpenIPMI-libs \
            pcre2 \
            gzip \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
    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 && \
--- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile
@ -57,7 +57,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            mysql-client \
            snmp-mibs-downloader \
            gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile
@ -51,7 +51,8 @@ RUN set -eux && \
            openipmi-libs \
            pcre2 \
            sqlite-libs \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile
@ -70,7 +70,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            OpenIPMI-libs \
            pcre2 \
            sqlite-libs \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
    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 && \
--- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
+++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile
@ -53,7 +53,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            libssl3 \
            libxml2 \
            snmp-mibs-downloader \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/server-mysql/alpine/Dockerfile
+++ b/Dockerfiles/server-mysql/alpine/Dockerfile
@ -54,7 +54,8 @@ RUN set -eux && \
            openipmi-libs \
            pcre2 \
            gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/server-mysql/rhel/Dockerfile
+++ b/Dockerfiles/server-mysql/rhel/Dockerfile
@ -74,7 +74,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            OpenIPMI-libs \
            pcre2 \
            gzip \
-            unixODBC" && \
+            unixODBC \
+            zlib" && \
    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 && \
--- a/Dockerfiles/server-mysql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile
@ -58,7 +58,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            mysql-client \
            snmp-mibs-downloader \
            gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/server-pgsql/alpine/Dockerfile
+++ b/Dockerfiles/server-pgsql/alpine/Dockerfile
@ -55,7 +55,8 @@ RUN set -eux && \
            postgresql-client \
            postgresql-libs \
            gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib" && \
    apk add \
            --no-cache \
            --clean-protected \
--- a/Dockerfiles/server-pgsql/ol/Dockerfile
+++ b/Dockerfiles/server-pgsql/ol/Dockerfile
@ -58,7 +58,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            postgresql-libs \
            zlib \
            unixODBC" && \
-    microdnf module enable postgresql:13 && \
+    microdnf module enable postgresql:15 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \
--- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile
+++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile
@ -59,7 +59,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \
            postgresql-client \
            snmp-mibs-downloader \
            gzip \
-            unixodbc" && \
+            unixodbc \
+            zlib1g" && \
    apt-get -y update && \
    DEBIAN_FRONTEND=noninteractive apt-get -y \
            --no-install-recommends install \
--- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile
@ -50,7 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            glibc-locale-source \
            supervisor" && \
    microdnf -y module enable php:7.4 && \
-    microdnf module enable postgresql:13 && \
+    microdnf module enable postgresql:15 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \
--- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
+++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile
@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
            postgresql \
            supervisor" && \
    microdnf -y module enable php:7.4 && \
-    microdnf module enable postgresql:13 && \
+    microdnf module enable postgresql:15 && \
    microdnf -y install \
            --disablerepo="*" \
            --enablerepo="ol8_baseos_latest" \