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

Updated RHEL from 9 to 10

Browse Source
This commit is contained in:
Alexey Pustovalov
2025-05-16 01:08:31 +09:00
parent 200d49489d
commit 212f9019ba
15 changed files with 200 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@ -82,7 +82,7 @@ ALPINE_BASE_IMAGE=alpine:3.21
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
RHEL_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
# Base images
BUILD_BASE_IMAGE=zabbix-build-base

33
Dockerfiles/agent/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -62,16 +62,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \
shadow-utils \
pcre2 \
libmodbus \
# libmodbus \
libcurl-minimal \
openldap-compat \
zlib" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
microdnf -y install \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -81,20 +82,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-10-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

26
Dockerfiles/agent2/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -62,13 +62,13 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
iputils \
shadow-utils \
pcre2 \
smartmontools \
# smartmontools \
sudo \
libcurl-minimal" && \
microdnf -y install \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
@ -77,20 +77,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

30
Dockerfiles/build-base/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4
@ -45,40 +45,34 @@ 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 \
unixODBC-devel \
zlib-devel" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \

8
Dockerfiles/build-mysql/rhel/Dockerfile
View File

@ -45,9 +45,9 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
RUN --mount=type=cache,target=/root/.cache/go-build/ \
--mount=type=cache,target=/root/go/ \
--mount=from=sources,target=/tmp/src \
--mount=type=bind,source=patches/,target=/tmp/patches \
--mount=from=config_templates,target=/tmp/conf \
--mount=from=sources,target=/tmp/src,z \
--mount=type=bind,source=patches/,target=/tmp/patches,z \
--mount=from=config_templates,target=/tmp/conf,z \
set -eux && \
cd /tmp/ && \
mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
@ -97,7 +97,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} \

8
Dockerfiles/build-pgsql/rhel/Dockerfile
View File

@ -45,9 +45,9 @@ ENV ZBX_SOURCES_DIR=/tmp/zabbix-${ZBX_VERSION} ZBX_OUTPUT_DIR=/tmp/zabbix-${ZBX_
RUN --mount=type=cache,target=/root/.cache/go-build/ \
--mount=type=cache,target=/root/go/ \
--mount=from=sources,target=/tmp/src \
--mount=type=bind,source=patches/,target=/tmp/patches \
--mount=from=config_templates,target=/tmp/conf \
--mount=from=sources,target=/tmp/src,z \
--mount=type=bind,source=patches/,target=/tmp/patches,z \
--mount=from=config_templates,target=/tmp/conf,z \
set -eux && \
cd /tmp/ && \
mkdir -p ${ZBX_OUTPUT_DIR}/agent/sbin/ && \
@ -99,7 +99,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} \

8
Dockerfiles/java-gateway/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -56,12 +56,12 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
INSTALL_PKGS="bash \
findutils \
shadow-utils \
java-17-openjdk-headless" && \
java-21-openjdk-headless" && \
microdnf -y install \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \

40
Dockerfiles/proxy-mysql/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -80,25 +80,25 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
openssl \
libssh \
libxml2 \
mysql \
mysql-libs \
mysql8.4 \
mysql8.4-libs \
net-snmp-agent-libs \
OpenIPMI-libs \
pcre2 \
gzip \
unixODBC \
zlib" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -108,19 +108,19 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

36
Dockerfiles/proxy-sqlite3/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -84,16 +84,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
sqlite-libs \
unixODBC \
zlib" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -103,20 +103,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

44
Dockerfiles/server-mysql/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -83,25 +83,25 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
openldap \
libssh \
libxml2 \
mysql \
mysql-libs \
mysql8.4 \
mysql8.4-libs \
net-snmp-agent-libs \
OpenIPMI-libs \
pcre2 \
gzip \
unixODBC \
zlib" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -111,22 +111,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --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 \

46
Dockerfiles/server-pgsql/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -91,23 +91,17 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
gzip \
unixODBC \
zlib" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
postgresql:16 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-9-$ARCH_SUFFIX-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "codeready-builder-for-rhel-10-$ARCH_SUFFIX-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -117,22 +111,22 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --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 \

26
Dockerfiles/snmptraps/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION=7.4
@ -56,8 +56,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y install \
--disableplugin=subscription-manager \
--disablerepo="*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
@ -66,20 +66,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

49
Dockerfiles/web-nginx-mysql/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -61,7 +61,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
shadow-utils \
findutils \
glibc-locale-source \
mysql \
gzip \
mysql8.4 \
nginx \
php-bcmath \
php-curl \
@ -72,23 +73,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-mbstring \
php-mysqlnd \
php-xml" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
nginx:1.24 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -98,20 +92,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \
@ -155,7 +149,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

47
Dockerfiles/web-nginx-pgsql/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} AS builder
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION
@ -62,6 +62,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
shadow-utils \
findutils \
glibc-locale-source \
gzip \
nginx \
postgresql \
php-bcmath \
@ -73,24 +74,16 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
php-mbstring \
php-pgsql \
php-xml" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y module enable \
--disablerepo "*" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
php:8.2 \
postgresql:16 \
nginx:1.24 && \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-baseos-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -100,20 +93,20 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y update \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--setopt=install_weak_deps=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
microdnf -y reinstall \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \
--setopt=tsflags=nodocs \
tzdata && \
# microdnf -y reinstall \
# --disableplugin=subscription-manager \
# --disablerepo "*" \
# --enablerepo "ubi-9-baseos-rpms" \
# --setopt=install_weak_deps=0 \
# --setopt=keepcache=0 \
# --best \
# --setopt=tsflags=nodocs \
# tzdata && \
groupadd \
--system \
--gid 1995 \

20
Dockerfiles/web-service/rhel/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
ARG MAJOR_VERSION=7.4
ARG RELEASE=0
ARG ZBX_VERSION=${MAJOR_VERSION}
@ -7,7 +7,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION}
FROM ${BUILD_BASE_IMAGE} AS builder
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.5
ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi10/ubi-minimal:10.0
FROM ${OS_BASE_IMAGE}
ARG MAJOR_VERSION
@ -60,15 +60,15 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
INSTALL_PKGS="bash \
shadow-utils \
chromium-headless" && \
curl --tlsv1.2 -sSf -L https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -o /tmp/epel-release-latest-9.noarch.rpm && \
rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \
rm -rf /tmp/epel-release-latest-9.noarch.rpm && \
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 && \
rm -rf /tmp/epel-release-latest-10.noarch.rpm && \
ARCH_SUFFIX="$(arch)"; \
microdnf -y install \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--enablerepo "rhel-10-for-$ARCH_SUFFIX-appstream-rpms" \
--enablerepo "epel" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
@ -78,8 +78,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \
microdnf -y install \
--disableplugin=subscription-manager \
--disablerepo "*" \
--enablerepo "ubi-9-baseos-rpms" \
--enablerepo "ubi-9-appstream-rpms" \
--enablerepo "ubi-10-baseos-rpms" \
--enablerepo "ubi-10-appstream-rpms" \
--setopt=install_weak_deps=0 \
--setopt=keepcache=0 \
--best \