From a0519655a9b319548680330d0902a11da64a5f1b Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 24 Mar 2024 22:42:53 +0900 Subject: [PATCH 1/2] Added zlib and devel packages. Updated PostgreSQL from 13 to 15 version --- Dockerfiles/agent/alpine/Dockerfile | 3 ++- Dockerfiles/agent/rhel/Dockerfile | 3 ++- Dockerfiles/agent/ubuntu/Dockerfile | 3 ++- Dockerfiles/build-base/alpine/Dockerfile | 3 ++- Dockerfiles/build-base/centos/Dockerfile | 3 ++- Dockerfiles/build-base/ol/Dockerfile | 5 +++-- Dockerfiles/build-base/rhel/Dockerfile | 3 ++- Dockerfiles/build-base/ubuntu/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/alpine/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 3 ++- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 3 ++- Dockerfiles/server-mysql/alpine/Dockerfile | 3 ++- Dockerfiles/server-mysql/rhel/Dockerfile | 3 ++- Dockerfiles/server-mysql/ubuntu/Dockerfile | 3 ++- Dockerfiles/server-pgsql/alpine/Dockerfile | 3 ++- Dockerfiles/server-pgsql/ol/Dockerfile | 2 +- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 3 ++- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- 22 files changed, 42 insertions(+), 23 deletions(-) diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 80673db14..0ec6bd717 100644 --- 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 \ diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 38ae81eb3..384d77096 100644 --- 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 && \ diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 171f0fbf2..752e9f0d5 100644 --- 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 \ diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index eb2c780a6..2ac44c6b5 100644 --- 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 \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index fae8d7f5b..d0b8af615 100644 --- 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 "*" \ diff --git a/Dockerfiles/build-base/ol/Dockerfile b/Dockerfiles/build-base/ol/Dockerfile index 169867d9e..d709bb341 100644 --- 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" \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 3377d1c75..07791494d 100644 --- 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 && \ diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index a5e710991..85676852a 100644 --- 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 \ diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index b22800bb2..294f03299 100644 --- 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 \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index a7ca19ba0..90eb8971d 100644 --- 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 && \ diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index f3b6bffee..b406292d2 100644 --- 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 \ diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index f574f107f..6d1b521af 100644 --- 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 \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index e8b3cf1a0..a997e7ab0 100644 --- 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 && \ diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index ede0a239b..92ea506ce 100644 --- 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 \ diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index 3cc9bbb3c..ac3683374 100644 --- 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 \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 8c3cd6c15..076e147e1 100644 --- 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 && \ diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 00bcd84ca..d8bca226c 100644 --- 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 \ diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 8ab5989e8..364edcb00 100644 --- 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 \ diff --git a/Dockerfiles/server-pgsql/ol/Dockerfile b/Dockerfiles/server-pgsql/ol/Dockerfile index 532e7e972..f2a73e6b9 100644 --- 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" \ diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 24dd9f5c4..5d2fc25ed 100644 --- 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 \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 627be7422..b5aa8745c 100644 --- 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" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 28e8db5ba..92de55460 100644 --- 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" \ From a36519f8d407e6fe03b215c910ec116c98eb4341 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Sun, 24 Mar 2024 23:12:11 +0900 Subject: [PATCH 2/2] Updated PHP and nginx packages on Oracle Linux and CentOS --- Dockerfiles/web-apache-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-apache-pgsql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/ol/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/ol/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index a34e185cb..24c32bdbb 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -51,7 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ supervisor" && \ dnf -y install epel-release && \ dnf -y module enable mysql && \ - dnf -y module enable php:7.4 && \ + dnf -y module enable php:8.0 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 1f0eb1087..0ec6d2253 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -50,7 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ glibc-locale-source \ supervisor" && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 6113c7b4c..f8b2569c8 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -50,7 +50,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ glibc-locale-source \ supervisor" && \ dnf -y install epel-release && \ - dnf -y module enable php:7.4 && \ + dnf -y module enable php:8.0 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index b5aa8745c..be06c82aa 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ findutils \ glibc-locale-source \ supervisor" && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 && \ microdnf module enable postgresql:15 && \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 01581e9a9..2191ec2a6 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ supervisor" && \ dnf -y install epel-release && \ dnf -y module enable mysql && \ - dnf -y module enable php:8.0 nginx:1.20 && \ + dnf -y module enable php:8.0 nginx:1.22 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 06a3fff58..9f47f8c30 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ glibc-locale-source \ supervisor" && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 nginx:1.22 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 0ce0f67dd..969c8b9a6 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ postgresql \ supervisor" && \ dnf -y install epel-release && \ - dnf -y module enable php:8.0 nginx:1.20 && \ + dnf -y module enable php:8.0 nginx:1.22 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 92de55460..409fca6b9 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -47,7 +47,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ php-xml \ postgresql \ supervisor" && \ - microdnf -y module enable php:7.4 && \ + microdnf -y module enable php:8.0 nginx:1.22 && \ microdnf module enable postgresql:15 && \ microdnf -y install \ --disablerepo="*" \