extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-09 16:45:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated CentOS Stream to 10 version from 9

Browse Source
This commit is contained in:
Alexey Pustovalov
2025-05-21 17:46:39 +09:00
parent ceb54c94a4
commit 5602f6b383
20 changed files with 36 additions and 68 deletions
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
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

5
Dockerfiles/agent/centos/Dockerfile
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,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 \

2
Dockerfiles/agent/rhel/Dockerfile
View File

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

2
Dockerfiles/agent2/centos/Dockerfile
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}

12
Dockerfiles/build-base/centos/Dockerfile
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,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" \

2
Dockerfiles/build-mysql/centos/Dockerfile
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} \

2
Dockerfiles/build-pgsql/centos/Dockerfile
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} \

2
Dockerfiles/build-sqlite3/centos/Dockerfile
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} \

4
Dockerfiles/java-gateway/centos/Dockerfile
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 "*" \

2
Dockerfiles/proxy-mysql/centos/Dockerfile
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}

2
Dockerfiles/proxy-sqlite3/centos/Dockerfile
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}

4
Dockerfiles/server-mysql/centos/Dockerfile
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}
@ -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 \

10
Dockerfiles/server-pgsql/centos/Dockerfile
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,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 \

2
Dockerfiles/snmptraps/centos/Dockerfile
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

12
Dockerfiles/web-apache-mysql/centos/Dockerfile
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}
@ -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

13
Dockerfiles/web-apache-pgsql/centos/Dockerfile
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}
@ -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 `

13
Dockerfiles/web-nginx-mysql/centos/Dockerfile
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}
@ -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

10
Dockerfiles/web-nginx-pgsql/centos/Dockerfile
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}
@ -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" \

2
Dockerfiles/web-service/centos/Dockerfile
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}

1
docker-compose_v3_centos_pgsql_local.yaml
View File

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