diff --git a/.env b/.env index 1c3c21b9e..3d62ea8d6 100644 --- a/.env +++ b/.env @@ -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 diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 6831c1740..7f17bca30 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 204a8f75c..09a4d7121 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 9675d367e..e88e48c5b 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/build-mysql/rhel/Dockerfile b/Dockerfiles/build-mysql/rhel/Dockerfile index 59d98c041..a7f45718f 100644 --- a/Dockerfiles/build-mysql/rhel/Dockerfile +++ b/Dockerfiles/build-mysql/rhel/Dockerfile @@ -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} \ diff --git a/Dockerfiles/build-pgsql/rhel/Dockerfile b/Dockerfiles/build-pgsql/rhel/Dockerfile index b8c61b6df..47d4bb8f0 100644 --- a/Dockerfiles/build-pgsql/rhel/Dockerfile +++ b/Dockerfiles/build-pgsql/rhel/Dockerfile @@ -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} \ diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 1634a7a93..ed54aad5c 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index d5987b404..71c7a494d 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index dbf07ea43..82baba63e 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 8d72fe0c4..678ee81d3 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 704dcdaef..77998f240 100644 --- a/Dockerfiles/server-pgsql/rhel/Dockerfile +++ b/Dockerfiles/server-pgsql/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index f872944f0..479fb6eb8 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 123c1a21c..d50d5281c 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -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 diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index 90282809b..c958f4833 100644 --- a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile @@ -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 \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index f69eff63c..35e9114cd 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -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 \