From 5602f6b3833219995ad1a5ca5d8f76c16febdfc7 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 21 May 2025 17:46:39 +0900 Subject: [PATCH] Updated CentOS Stream to 10 version from 9 --- .env | 2 +- Dockerfiles/agent/centos/Dockerfile | 5 +++-- Dockerfiles/agent/rhel/Dockerfile | 2 +- Dockerfiles/agent2/centos/Dockerfile | 2 +- Dockerfiles/build-base/centos/Dockerfile | 12 +++--------- Dockerfiles/build-mysql/centos/Dockerfile | 2 +- Dockerfiles/build-pgsql/centos/Dockerfile | 2 +- Dockerfiles/build-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/java-gateway/centos/Dockerfile | 4 ++-- Dockerfiles/proxy-mysql/centos/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/centos/Dockerfile | 2 +- Dockerfiles/server-mysql/centos/Dockerfile | 4 ++-- Dockerfiles/server-pgsql/centos/Dockerfile | 10 ++-------- Dockerfiles/snmptraps/centos/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/centos/Dockerfile | 12 ++++-------- Dockerfiles/web-apache-pgsql/centos/Dockerfile | 13 ++++--------- Dockerfiles/web-nginx-mysql/centos/Dockerfile | 13 ++++--------- Dockerfiles/web-nginx-pgsql/centos/Dockerfile | 10 +--------- Dockerfiles/web-service/centos/Dockerfile | 2 +- docker-compose_v3_centos_pgsql_local.yaml | 1 + 20 files changed, 36 insertions(+), 68 deletions(-) diff --git a/.env b/.env index 3d62ea8d6..5096d364e 100644 --- a/.env +++ b/.env @@ -79,7 +79,7 @@ RESTART_POLICY=unless-stopped # Cache base images ALPINE_BASE_IMAGE=alpine:3.21 -CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +CENTOS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal OL_BASE_IMAGE=oraclelinux:9-slim UBUNTU_BASE_IMAGE=ubuntu:noble RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0 diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 54c6674b8..a3f0d27fb 100644 --- a/Dockerfiles/agent/centos/Dockerfile +++ b/Dockerfiles/agent/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -43,8 +43,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ iputils \ pcre2 \ libcurl-minimal \ - libmodbus \ +# libmodbus \ openssl-libs \ + openldap \ shadow-utils \ zlib" && \ microdnf -y install \ diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 7f17bca30..b0718532a 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -64,7 +64,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ pcre2 \ # libmodbus \ libcurl-minimal \ - openldap-compat \ + openldap \ zlib" && \ curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm -o /tmp/epel-release-latest-10.noarch.rpm && \ rpm -ivh /tmp/epel-release-latest-10.noarch.rpm && \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index b577d6eaf..dee966744 100644 --- a/Dockerfiles/agent2/centos/Dockerfile +++ b/Dockerfiles/agent2/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 3d9f1b474..f5c42d0bb 100644 --- a/Dockerfiles/build-base/centos/Dockerfile +++ b/Dockerfiles/build-base/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.4 @@ -31,7 +31,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libcurl-devel \ libevent-devel \ libssh-devel \ - libmodbus-devel \ +# libmodbus-devel \ libxml2-devel \ openssl-devel \ openldap-devel \ @@ -43,7 +43,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ sqlite-devel \ postgresql-private-devel \ postgresql-server-devel \ - java-17-openjdk-devel \ + java-21-openjdk-devel \ git \ gettext \ go-toolset \ @@ -56,12 +56,6 @@ 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-mysql/centos/Dockerfile b/Dockerfiles/build-mysql/centos/Dockerfile index ba47c3faa..36b7f2aa8 100644 --- a/Dockerfiles/build-mysql/centos/Dockerfile +++ b/Dockerfiles/build-mysql/centos/Dockerfile @@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --enable-webservice \ --with-ldap \ --with-libcurl \ - --with-libmodbus \ +# --with-libmodbus \ --with-libpcre2 \ --with-libxml2 \ --with-${DB_TYPE} \ diff --git a/Dockerfiles/build-pgsql/centos/Dockerfile b/Dockerfiles/build-pgsql/centos/Dockerfile index 193850e18..1da2d16a2 100644 --- a/Dockerfiles/build-pgsql/centos/Dockerfile +++ b/Dockerfiles/build-pgsql/centos/Dockerfile @@ -87,7 +87,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --enable-webservice \ --with-ldap \ --with-libcurl \ - --with-libmodbus \ +# --with-libmodbus \ --with-libpcre2 \ --with-libxml2 \ --with-${DB_TYPE} \ diff --git a/Dockerfiles/build-sqlite3/centos/Dockerfile b/Dockerfiles/build-sqlite3/centos/Dockerfile index ac34c7837..0ffcd864b 100644 --- a/Dockerfiles/build-sqlite3/centos/Dockerfile +++ b/Dockerfiles/build-sqlite3/centos/Dockerfile @@ -78,7 +78,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \ --enable-proxy \ --with-ldap \ --with-libcurl \ - --with-libmodbus \ +# --with-libmodbus \ --with-libpcre2 \ --with-libxml2 \ --with-${DB_TYPE} \ diff --git a/Dockerfiles/java-gateway/centos/Dockerfile b/Dockerfiles/java-gateway/centos/Dockerfile index 6ae78269e..1bd4d786c 100644 --- a/Dockerfiles/java-gateway/centos/Dockerfile +++ b/Dockerfiles/java-gateway/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -36,7 +36,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ set -eux && \ INSTALL_PKGS="bash \ shadow-utils \ - java-17-openjdk-headless \ + java-21-openjdk-headless \ findutils" && \ microdnf -y install \ --disablerepo "*" \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index 65aff0e1f..c8efd0ab3 100644 --- a/Dockerfiles/proxy-mysql/centos/Dockerfile +++ b/Dockerfiles/proxy-mysql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index a1962a2be..53e440f56 100644 --- a/Dockerfiles/proxy-sqlite3/centos/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index a65f735fb..552fa9d25 100644 --- a/Dockerfiles/server-mysql/centos/Dockerfile +++ b/Dockerfiles/server-mysql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -98,7 +98,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=tsflags=nodocs \ tzdata && \ microdnf download libcurl && \ - rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \ + rpm -Uvh --nodeps --replacefiles "*curl*$( uname -m ).rpm" && \ microdnf remove -y libcurl-minimal && \ rm -rf "*curl*$( uname -i ).rpm" && \ groupadd \ diff --git a/Dockerfiles/server-pgsql/centos/Dockerfile b/Dockerfiles/server-pgsql/centos/Dockerfile index 155c6a06a..82cc6e44d 100644 --- a/Dockerfiles/server-pgsql/centos/Dockerfile +++ b/Dockerfiles/server-pgsql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} @@ -80,12 +80,6 @@ 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" \ @@ -103,7 +97,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=tsflags=nodocs \ tzdata && \ microdnf download libcurl && \ - rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \ + rpm -Uvh --nodeps --replacefiles "*curl*$( uname -m ).rpm" && \ microdnf remove -y libcurl-minimal && \ rm -rf "*curl*$( uname -i ).rpm" && \ groupadd \ diff --git a/Dockerfiles/snmptraps/centos/Dockerfile b/Dockerfiles/snmptraps/centos/Dockerfile index cb4e8ab91..9b0810b28 100644 --- a/Dockerfiles/snmptraps/centos/Dockerfile +++ b/Dockerfiles/snmptraps/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.4 diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index f4819e4a2..d73de26e3 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -53,6 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ findutils \ glibc-locale-source \ shadow-utils \ + gzip \ supervisor" && \ microdnf -y install \ --disablerepo "*" \ @@ -61,12 +62,6 @@ 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 \ - php:8.2 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -128,7 +123,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ microdnf -y remove \ findutils \ - glibc-locale-source + glibc-locale-source \ + gzip HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ CMD curl -f http://localhost:8080/ping || exit 1 diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index f8639117d..f2f98a28a 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -53,6 +53,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ findutils \ glibc-locale-source \ shadow-utils \ + gzip \ supervisor" && \ microdnf -y install \ --disablerepo "*" \ @@ -61,13 +62,6 @@ 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 \ - php:8.2 \ - postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -129,7 +123,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ microdnf -y remove \ findutils \ - glibc-locale-source + glibc-locale-source \ + gzip HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ CMD curl -f http://localhost:8080/ping || exit ` diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index f220fb7fa..c3e31ce8f 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -51,14 +51,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ findutils \ glibc-locale-source \ shadow-utils \ + gzip \ supervisor" && \ - microdnf -y module enable \ - --disablerepo "*" \ - --enablerepo "appstream" \ - --setopt=install_weak_deps=0 \ - --setopt=keepcache=0 \ - php:8.2 \ - nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "extras-common" \ @@ -124,7 +118,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ chmod -R g=u /var/lib/php/session/ && \ microdnf -y remove \ findutils \ - glibc-locale-source + glibc-locale-source \ + gzip HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ CMD curl -f http://localhost:8080/ping || exit 1 diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index eb1a49bff..6c0e37af6 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} @@ -59,14 +59,6 @@ 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 \ - php:8.2 \ - postgresql:16 \ - nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 7f53d293f..9cc1494e9 100644 --- a/Dockerfiles/web-service/centos/Dockerfile +++ b/Dockerfiles/web-service/centos/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream10-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} diff --git a/docker-compose_v3_centos_pgsql_local.yaml b/docker-compose_v3_centos_pgsql_local.yaml index 33fbd0cfd..add439024 100644 --- a/docker-compose_v3_centos_pgsql_local.yaml +++ b/docker-compose_v3_centos_pgsql_local.yaml @@ -41,6 +41,7 @@ services: build: context: ./Dockerfiles/build-sqlite3/${CENTOS_OS_TAG_SHORT} additional_contexts: + - sources=./sources/ - config_templates=./config_templates/ args: BUILD_BASE_IMAGE: ${BUILD_BASE_IMAGE}:${ZABBIX_CENTOS_IMAGE_TAG}${ZABBIX_LOCAL_IMAGE_TAG_POSTFIX}