diff --git a/.env b/.env index 9b642266f..86b962fb5 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:stream10-minimal +CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal OL_BASE_IMAGE=oraclelinux:9-slim UBUNTU_BASE_IMAGE=ubuntu:noble RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 diff --git a/Dockerfiles/agent/centos/Dockerfile b/Dockerfiles/agent/centos/Dockerfile index 6265630b7..54c6674b8 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -43,8 +43,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ iputils \ pcre2 \ libcurl-minimal \ -# libmodbus \ - openldap \ + libmodbus \ openssl-libs \ shadow-utils \ zlib" && \ @@ -55,8 +54,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/agent2/centos/Dockerfile b/Dockerfiles/agent2/centos/Dockerfile index 9c226927e..b577d6eaf 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -54,8 +54,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/build-base/centos/Dockerfile b/Dockerfiles/build-base/centos/Dockerfile index 27fce1765..3d9f1b474 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.4 @@ -31,19 +31,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libcurl-devel \ libevent-devel \ libssh-devel \ -# libmodbus-devel \ + libmodbus-devel \ libxml2-devel \ openssl-devel \ openldap-devel \ make \ - mysql8.4-devel \ + mysql-devel \ net-snmp-devel \ OpenIPMI-devel \ openldap-devel \ sqlite-devel \ postgresql-private-devel \ postgresql-server-devel \ - java-21-openjdk-devel \ + java-17-openjdk-devel \ git \ gettext \ go-toolset \ @@ -56,8 +56,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ + 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 36b7f2aa8..ba47c3faa 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 1da2d16a2..193850e18 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 0ffcd864b..ac34c7837 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 1bd4d786c..6ae78269e 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-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-21-openjdk-headless \ + java-17-openjdk-headless \ findutils" && \ microdnf -y install \ --disablerepo "*" \ diff --git a/Dockerfiles/proxy-mysql/centos/Dockerfile b/Dockerfiles/proxy-mysql/centos/Dockerfile index eab9e658b..65aff0e1f 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -57,8 +57,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ file-libs \ fping \ libxml2 \ - mysql8.4 \ - mysql8.4-libs \ + mysql \ + mysql-libs \ net-snmp-libs \ OpenIPMI-libs \ openldap \ @@ -75,8 +75,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/proxy-sqlite3/centos/Dockerfile b/Dockerfiles/proxy-sqlite3/centos/Dockerfile index 02da1c54b..a1962a2be 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_VERSION} @@ -70,8 +70,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/server-mysql/centos/Dockerfile b/Dockerfiles/server-mysql/centos/Dockerfile index 073ec1926..a65f735fb 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -61,8 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ libpsl \ libbrotli \ libxml2 \ - mysql8.4 \ - mysql8.4-libs \ + mysql \ + mysql-libs \ net-snmp-libs \ OpenIPMI-libs \ openldap \ @@ -80,8 +80,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -100,7 +98,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=tsflags=nodocs \ tzdata && \ microdnf download libcurl && \ - rpm -Uvh --nodeps --replacefiles "*curl*el10*.rpm" && \ + rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).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 77eb9b03a..155c6a06a 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} @@ -80,8 +80,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -99,7 +103,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=tsflags=nodocs \ tzdata && \ microdnf download libcurl && \ - rpm -Uvh --nodeps --replacefiles "*curl*el10*.rpm" && \ + rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).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 9b0810b28..cb4e8ab91 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-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 17cc1477b..f4819e4a2 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -52,7 +52,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ php-xml \ findutils \ glibc-locale-source \ - gzip \ shadow-utils \ supervisor" && \ microdnf -y install \ @@ -62,8 +61,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ + microdnf -y module enable \ + --disablerepo "*" \ + --enablerepo "appstream" \ + --setopt=install_weak_deps=0 \ + --setopt=keepcache=0 \ + php:8.2 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -106,7 +109,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ - gunzip /usr/share/i18n/charmaps/UTF-8.gz && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.po' | xargs rm -f && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | xargs rm -f && \ @@ -126,8 +128,7 @@ 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 \ - gzip + glibc-locale-source 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 73423cd08..f8639117d 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -52,7 +52,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ postgresql \ findutils \ glibc-locale-source \ - gzip \ shadow-utils \ supervisor" && \ microdnf -y install \ @@ -62,8 +61,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ + 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" \ @@ -106,7 +110,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ - gunzip /usr/share/i18n/charmaps/UTF-8.gz && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.po' | xargs rm -f && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | xargs rm -f && \ @@ -126,8 +129,7 @@ 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 \ - gzip + glibc-locale-source 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 42a340898..f220fb7fa 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -50,9 +50,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ php-xml \ findutils \ glibc-locale-source \ - gzip \ shadow-utils \ 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" \ @@ -60,8 +66,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ @@ -101,7 +105,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ - gunzip /usr/share/i18n/charmaps/UTF-8.gz && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.po' | xargs rm -f && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | xargs rm -f && \ @@ -121,8 +124,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ chmod -R g=u /var/lib/php/session/ && \ microdnf -y remove \ findutils \ - glibc-locale-source \ - gzip + glibc-locale-source 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 853e8eafa..eb1a49bff 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_VERSION} @@ -39,7 +39,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ curl-minimal \ findutils \ glibc-locale-source \ - gzip \ nginx \ php-bcmath \ php-curl \ @@ -60,8 +59,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ + 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" \ @@ -101,7 +106,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -rf tests && \ - gunzip /usr/share/i18n/charmaps/UTF-8.gz && \ rm -f locale/add_new_language.sh locale/update_po.sh locale/make_mo.sh && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.po' | xargs rm -f && \ find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | xargs rm -f && \ @@ -121,8 +125,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ chmod -R g=u /var/lib/php/session/ && \ microdnf -y remove \ findutils \ - glibc-locale-source \ - gzip + glibc-locale-source 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-service/centos/Dockerfile b/Dockerfiles/web-service/centos/Dockerfile index 47eca10b0..7f53d293f 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:stream10-minimal +ARG OS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} @@ -46,8 +46,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --setopt=keepcache=0 \ --best \ --nodocs epel-release && \ - sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ - sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \