Updated CentOS 9 to CentOS 10 Stream

This commit is contained in:
Alexey Pustovalov 2025-02-17 15:11:04 +09:00
parent cb1e3a1240
commit f0feafafc1
18 changed files with 70 additions and 73 deletions

2
.env
View File

@ -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/ubi9/ubi-minimal:9.5

View File

@ -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,7 +43,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \
pcre2 \
libcurl-minimal \
libmodbus \
# libmodbus \
openldap \
openssl-libs \
shadow-utils \
zlib" && \
@ -54,6 +55,8 @@ 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" \

View File

@ -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}
@ -54,6 +54,8 @@ 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" \

View File

@ -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,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 \
mysql-devel \
mysql8.4-devel \
net-snmp-devel \
OpenIPMI-devel \
openldap-devel \
sqlite-devel \
postgresql-private-devel \
postgresql-server-devel \
java-17-openjdk-devel \
java-21-openjdk-devel \
git \
gettext \
go-toolset \
@ -56,12 +56,8 @@ 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 && \
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" \

View File

@ -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} \

View File

@ -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} \

View File

@ -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} \

View File

@ -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 "*" \

View File

@ -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}
@ -57,8 +57,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
file-libs \
fping \
libxml2 \
mysql \
mysql-libs \
mysql8.4 \
mysql8.4-libs \
net-snmp-libs \
OpenIPMI-libs \
openldap \
@ -75,6 +75,8 @@ 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" \

View File

@ -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}
@ -70,6 +70,8 @@ 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" \

View File

@ -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}
@ -61,8 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
libpsl \
libbrotli \
libxml2 \
mysql \
mysql-libs \
mysql8.4 \
mysql8.4-libs \
net-snmp-libs \
OpenIPMI-libs \
openldap \
@ -80,6 +80,8 @@ 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" \
@ -98,7 +100,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*el10*.rpm" && \
microdnf remove -y libcurl-minimal && \
rm -rf "*curl*$( uname -i ).rpm" && \
groupadd \

View File

@ -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,8 @@ 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 && \
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" \
@ -103,7 +99,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*el10*.rpm" && \
microdnf remove -y libcurl-minimal && \
rm -rf "*curl*$( uname -i ).rpm" && \
groupadd \

View File

@ -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

View File

@ -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}
@ -52,6 +52,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-xml \
findutils \
glibc-locale-source \
gzip \
shadow-utils \
supervisor" && \
microdnf -y install \
@ -61,12 +62,8 @@ 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 && \
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" \
@ -109,6 +106,7 @@ 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 && \
@ -128,7 +126,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

View File

@ -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}
@ -52,6 +52,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
postgresql \
findutils \
glibc-locale-source \
gzip \
shadow-utils \
supervisor" && \
microdnf -y install \
@ -61,13 +62,8 @@ 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 && \
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" \
@ -110,6 +106,7 @@ 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 && \
@ -129,7 +126,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 `

View File

@ -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}
@ -50,15 +50,9 @@ 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" \
@ -66,6 +60,8 @@ 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" \
@ -105,6 +101,7 @@ 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 && \
@ -124,7 +121,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

View File

@ -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}
@ -39,6 +39,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
curl-minimal \
findutils \
glibc-locale-source \
gzip \
nginx \
php-bcmath \
php-curl \
@ -59,14 +60,8 @@ 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 && \
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" \
@ -106,6 +101,7 @@ 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 && \
@ -125,7 +121,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

View File

@ -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}
@ -46,6 +46,8 @@ 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" \