extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-20 18:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Updated CentOS 9 to CentOS 10 Stream"

Browse Source 
This reverts commit f0feafafc119382945f9a04c70e2a5b865ec4b29.
This commit is contained in:
Alexey Pustovalov 2025-02-18 15:32:19 +09:00
parent f0feafafc1
commit e678ca156f
18 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -79,7 +79,7 @@ RESTART_POLICY=unless-stopped
# Cache base images # Cache base images
ALPINE_BASE_IMAGE=alpine:3.21 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 OL_BASE_IMAGE=oraclelinux:9-slim
UBUNTU_BASE_IMAGE=ubuntu:noble UBUNTU_BASE_IMAGE=ubuntu:noble
RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5 RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5

7
Dockerfiles/agent/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
@ -43,8 +43,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \ iputils \
pcre2 \ pcre2 \
libcurl-minimal \ libcurl-minimal \
# libmodbus \ libmodbus \
openldap \
openssl-libs \ openssl-libs \
shadow-utils \ shadow-utils \
zlib" && \ zlib" && \
@ -55,8 +54,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \

4
Dockerfiles/agent2/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \

16
Dockerfiles/build-base/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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} FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4
@ -31,19 +31,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
libcurl-devel \ libcurl-devel \
libevent-devel \ libevent-devel \
libssh-devel \ libssh-devel \
# libmodbus-devel \ libmodbus-devel \
libxml2-devel \ libxml2-devel \
openssl-devel \ openssl-devel \
openldap-devel \ openldap-devel \
make \ make \
mysql8.4-devel \ mysql-devel \
net-snmp-devel \ net-snmp-devel \
OpenIPMI-devel \ OpenIPMI-devel \
openldap-devel \ openldap-devel \
sqlite-devel \ sqlite-devel \
postgresql-private-devel \ postgresql-private-devel \
postgresql-server-devel \ postgresql-server-devel \
java-21-openjdk-devel \ java-17-openjdk-devel \
git \ git \
gettext \ gettext \
go-toolset \ go-toolset \
@ -56,8 +56,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --nodocs epel-release && \
sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y module enable \
sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ --disablerepo "*" \
--enablerepo "appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \

2
Dockerfiles/build-mysql/centos/Dockerfile
View File

@ -86,7 +86,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-webservice \ --enable-webservice \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
# --with-libmodbus \ --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

2
Dockerfiles/build-pgsql/centos/Dockerfile
View File

@ -87,7 +87,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-webservice \ --enable-webservice \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
# --with-libmodbus \ --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

2
Dockerfiles/build-sqlite3/centos/Dockerfile
View File

@ -78,7 +78,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build/ \
--enable-proxy \ --enable-proxy \
--with-ldap \ --with-ldap \
--with-libcurl \ --with-libcurl \
# --with-libmodbus \ --with-libmodbus \
--with-libpcre2 \ --with-libpcre2 \
--with-libxml2 \ --with-libxml2 \
--with-${DB_TYPE} \ --with-${DB_TYPE} \

4
Dockerfiles/java-gateway/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 && \ set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
shadow-utils \ shadow-utils \
java-21-openjdk-headless \ java-17-openjdk-headless \
findutils" && \ findutils" && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \

8
Dockerfiles/proxy-mysql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 \ file-libs \
fping \ fping \
libxml2 \ libxml2 \
mysql8.4 \ mysql \
mysql8.4-libs \ mysql-libs \
net-snmp-libs \ net-snmp-libs \
OpenIPMI-libs \ OpenIPMI-libs \
openldap \ openldap \
@ -75,8 +75,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \

4
Dockerfiles/proxy-sqlite3/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:centos-${ZBX_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 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \

10
Dockerfiles/server-mysql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
@ -61,8 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
libpsl \ libpsl \
libbrotli \ libbrotli \
libxml2 \ libxml2 \
mysql8.4 \ mysql \
mysql8.4-libs \ mysql-libs \
net-snmp-libs \ net-snmp-libs \
OpenIPMI-libs \ OpenIPMI-libs \
openldap \ openldap \
@ -80,8 +80,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -100,7 +98,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=tsflags=nodocs \ --setopt=tsflags=nodocs \
tzdata && \ tzdata && \
microdnf download libcurl && \ microdnf download libcurl && \
rpm -Uvh --nodeps --replacefiles "*curl*el10*.rpm" && \ rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
microdnf remove -y libcurl-minimal && \ microdnf remove -y libcurl-minimal && \
rm -rf "*curl*$( uname -i ).rpm" && \ rm -rf "*curl*$( uname -i ).rpm" && \
groupadd \ groupadd \

12
Dockerfiles/server-pgsql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_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 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --nodocs epel-release && \
sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y module enable \
sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ --disablerepo "*" \
--enablerepo "appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -99,7 +103,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=tsflags=nodocs \ --setopt=tsflags=nodocs \
tzdata && \ tzdata && \
microdnf download libcurl && \ microdnf download libcurl && \
rpm -Uvh --nodeps --replacefiles "*curl*el10*.rpm" && \ rpm -Uvh --nodeps --replacefiles "*curl*$( uname -i ).rpm" && \
microdnf remove -y libcurl-minimal && \ microdnf remove -y libcurl-minimal && \
rm -rf "*curl*$( uname -i ).rpm" && \ rm -rf "*curl*$( uname -i ).rpm" && \
groupadd \ groupadd \

2
Dockerfiles/snmptraps/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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} FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4 ARG MAJOR_VERSION=7.4

15
Dockerfiles/web-apache-mysql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 \ php-xml \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
gzip \
shadow-utils \ shadow-utils \
supervisor" && \ supervisor" && \
microdnf -y install \ microdnf -y install \
@ -62,8 +61,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --nodocs epel-release && \
sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y module enable \
sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ --disablerepo "*" \
--enablerepo "appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -106,7 +109,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
cd ${ZABBIX_WWW_ROOT}/ && \ cd ${ZABBIX_WWW_ROOT}/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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 && \ 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 '*.po' | xargs rm -f && \
find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | 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/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

16
Dockerfiles/web-apache-pgsql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION} ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_VERSION}
@ -52,7 +52,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
postgresql \ postgresql \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
gzip \
shadow-utils \ shadow-utils \
supervisor" && \ supervisor" && \
microdnf -y install \ microdnf -y install \
@ -62,8 +61,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --nodocs epel-release && \
sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y module enable \
sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ --disablerepo "*" \
--enablerepo "appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
postgresql:16 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -106,7 +110,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
cd ${ZABBIX_WWW_ROOT}/ && \ cd ${ZABBIX_WWW_ROOT}/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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 && \ 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 '*.po' | xargs rm -f && \
find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | 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/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit ` CMD curl -f http://localhost:8080/ping || exit `

16
Dockerfiles/web-nginx-mysql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 \ php-xml \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
gzip \
shadow-utils \ shadow-utils \
supervisor" && \ 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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "extras-common" \ --enablerepo "extras-common" \
@ -60,8 +66,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -101,7 +105,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
cd ${ZABBIX_WWW_ROOT}/ && \ cd ${ZABBIX_WWW_ROOT}/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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 && \ 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 '*.po' | xargs rm -f && \
find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | 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/ && \ chmod -R g=u /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

17
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:centos-${ZBX_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 \ curl-minimal \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source \
gzip \
nginx \ nginx \
php-bcmath \ php-bcmath \
php-curl \ php-curl \
@ -60,8 +59,14 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
--setopt=keepcache=0 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --nodocs epel-release && \
sed -i 's/$releasever_major${releasever_minor:+.$releasever_minor}/$releasever/g' /etc/yum.repos.d/epel*.repo && \ microdnf -y module enable \
sed -i 's/$releasever_major/$releasever/g' /etc/yum.repos.d/epel*.repo && \ --disablerepo "*" \
--enablerepo "appstream" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
postgresql:16 \
nginx:1.24 && \
microdnf -y install \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \
@ -101,7 +106,6 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
cd ${ZABBIX_WWW_ROOT}/ && \ cd ${ZABBIX_WWW_ROOT}/ && \
rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \
rm -rf tests && \ 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 && \ 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 '*.po' | xargs rm -f && \
find ${ZABBIX_WWW_ROOT}/locale -name '*.sh' | 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/ && \ chmod -R g=u /var/lib/php/session/ && \
microdnf -y remove \ microdnf -y remove \
findutils \ findutils \
glibc-locale-source \ glibc-locale-source
gzip
HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \ HEALTHCHECK --interval=1m30s --timeout=3s --retries=3 --start-period=40s --start-interval=5s \
CMD curl -f http://localhost:8080/ping || exit 1 CMD curl -f http://localhost:8080/ping || exit 1

4
Dockerfiles/web-service/centos/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1 # 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 MAJOR_VERSION=7.4
ARG ZBX_VERSION=${MAJOR_VERSION} ARG ZBX_VERSION=${MAJOR_VERSION}
ARG BUILD_BASE_IMAGE=zabbix-build-mysql:centos-${ZBX_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 \ --setopt=keepcache=0 \
--best \ --best \
--nodocs epel-release && \ --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 \ microdnf -y install \
--disablerepo "*" \ --disablerepo "*" \
--enablerepo "baseos" \ --enablerepo "baseos" \