diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index 92ee87b01..4c850d3db 100644 --- a/Dockerfiles/agent/rhel/Dockerfile +++ b/Dockerfiles/agent/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -57,20 +57,20 @@ RUN set -eux && \ iputils \ shadow-utils \ pcre2 \ - libcurl" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ + libcurl-minimal" && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 42d00f4db..08e2d9868 100644 --- a/Dockerfiles/agent2/rhel/Dockerfile +++ b/Dockerfiles/agent2/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -64,20 +64,20 @@ RUN set -eux && \ pcre2 \ smartmontools \ sudo \ - libcurl" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ + libcurl-minimal" && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 342d757d9..58d265e71 100644 --- a/Dockerfiles/build-base/rhel/Dockerfile +++ b/Dockerfiles/build-base/rhel/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION=6.4 ARG RELEASE= @@ -54,14 +54,13 @@ RUN set -eux && \ git \ gettext \ unixODBC-devel" && \ - microdnf -y module enable mysql && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ - --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ - --enablerepo "codeready-builder-for-rhel-8-x86_64-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ + --enablerepo "codeready-builder-for-rhel-9-x86_64-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 883ccd452..74b6ee251 100644 --- a/Dockerfiles/java-gateway/rhel/Dockerfile +++ b/Dockerfiles/java-gateway/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -55,8 +55,8 @@ RUN set -eux && \ java-1.8.0-openjdk-headless" && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index cc495e876..2182b7778 100644 --- a/Dockerfiles/proxy-mysql/rhel/Dockerfile +++ b/Dockerfiles/proxy-mysql/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -61,7 +61,7 @@ RUN set -eux && \ shadow-utils \ fping \ iputils \ - libcurl \ + libcurl-minimal \ libevent \ openldap \ libssh \ @@ -72,23 +72,23 @@ RUN set -eux && \ OpenIPMI-libs \ pcre2 \ unixODBC" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ - microdnf -y module enable mysql && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ - --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ + --enablerepo "codeready-builder-for-rhel-9-x86_64-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index d0a9e0c3a..e2a81e57d 100644 --- a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -60,7 +60,7 @@ RUN set -eux && \ shadow-utils \ fping \ iputils \ - libcurl \ + libcurl-minimal \ libevent \ openldap \ libssh \ @@ -70,21 +70,22 @@ RUN set -eux && \ pcre2 \ sqlite-libs \ unixODBC" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 1b81c8c93..152df74ef 100644 --- a/Dockerfiles/server-mysql/rhel/Dockerfile +++ b/Dockerfiles/server-mysql/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -63,7 +63,7 @@ RUN set -eux && \ tzdata \ iputils \ hostname \ - libcurl \ + libcurl-minimal \ libevent \ openldap \ libssh \ @@ -74,23 +74,23 @@ RUN set -eux && \ OpenIPMI-libs \ pcre2 \ unixODBC" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ - microdnf -y module enable mysql && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ - --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ + --enablerepo "codeready-builder-for-rhel-9-x86_64-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 629f8d4b0..436f8d1e4 100644 --- a/Dockerfiles/snmptraps/rhel/Dockerfile +++ b/Dockerfiles/snmptraps/rhel/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION=6.4 ARG RELEASE= @@ -48,8 +48,8 @@ RUN set -eux && \ net-snmp" && \ microdnf -y install \ --disablerepo="*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index e7dc98bc4..ce4531ef3 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -51,7 +51,7 @@ COPY --from=builder ["/tmp/zabbix-${ZBX_VERSION}/ui", "/usr/share/zabbix"] RUN set -eux && \ INSTALL_PKGS="bash \ tzdata \ - curl \ + curl-minimal \ supervisor \ shadow-utils \ findutils \ @@ -66,24 +66,22 @@ RUN set -eux && \ php-mbstring \ php-mysqlnd \ php-xml" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ - microdnf -y module enable mysql && \ - microdnf -y module enable php:8.0 nginx:1.20 && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ - --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ ${INSTALL_PKGS} && \ microdnf -y reinstall \ - --enablerepo "ubi-8-baseos-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index e37480aec..4ca4cb368 100644 --- a/Dockerfiles/web-service/rhel/Dockerfile +++ b/Dockerfiles/web-service/rhel/Dockerfile @@ -6,7 +6,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:rhel-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi9/ubi-minimal ARG MAJOR_VERSION ARG RELEASE @@ -53,15 +53,15 @@ RUN set -eux && \ INSTALL_PKGS="bash \ shadow-utils \ chromium-headless" && \ - curl -sSL -o /tmp/epel-release-latest-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \ - rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ - rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ + curl -sSL -o /tmp/epel-release-latest-9.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + rpm -ivh /tmp/epel-release-latest-9.noarch.rpm && \ + rm -rf /tmp/epel-release-latest-9.noarch.rpm && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ - --enablerepo "rhel-8-for-x86_64-baseos-rpms" \ - --enablerepo "rhel-8-for-x86_64-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ + --enablerepo "rhel-9-for-x86_64-baseos-rpms" \ + --enablerepo "rhel-9-for-x86_64-appstream-rpms" \ --enablerepo "epel" \ --setopt=install_weak_deps=0 \ --best \ @@ -69,8 +69,8 @@ RUN set -eux && \ ${INSTALL_PKGS} && \ microdnf -y install \ --disablerepo "*" \ - --enablerepo "ubi-8-baseos-rpms" \ - --enablerepo "ubi-8-appstream-rpms" \ + --enablerepo "ubi-9-baseos-rpms" \ + --enablerepo "ubi-9-appstream-rpms" \ --setopt=install_weak_deps=0 \ --best \ --setopt=tsflags=nodocs \ diff --git a/README.md b/README.md index efa24ae7d..8e24b5b07 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ There is some documentation and examples in the [official Zabbix Documentation]( Please also follow usage instructions of each Zabbix component image: * [zabbix-appliance](https://hub.docker.com/r/zabbix/zabbix-appliance/) - Zabbix appliance with built-in MySQL server, Zabbix server, Zabbix Java Gateway and Zabbix frontend based on Nginx web-server - > **Important information: Zabbix Docker Appliance has been decommissioned (except Red Hat edition) and will not be available for 3.0.31, 4.0.19, 4.4.7, 5.0.0 and newer releases. Please use a separate Docker images for each component instead of the all-in-one solution.** + > **Important information: Zabbix Docker Appliance has been decommissioned and will not be available for 3.0.31, 4.0.19, 4.4.7, 5.0.0 and newer releases. Please use a separate Docker images for each component instead of the all-in-one solution.** * [zabbix-agent](https://hub.docker.com/r/zabbix/zabbix-agent/) - Zabbix agent * [zabbix-agent2](https://hub.docker.com/r/zabbix/zabbix-agent2/) - Zabbix agent 2