diff --git a/.env b/.env index ea4e02db4..749e2385a 100644 --- a/.env +++ b/.env @@ -82,7 +82,7 @@ ALPINE_BASE_IMAGE=alpine:3.23 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.6 +RHEL_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 # Base images BUILD_BASE_IMAGE=zabbix-build-base diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index ce4f46378..632e59f31 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 9bb505e10..2aa93c69a 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index bb0c29040..0a2fe5d5a 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.2 diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index a0ffd016d..e8bb3814d 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 07f119fd3..65ab9b356 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index e845ad762..6dbd5afae 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 26ccf2980..4567661ae 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index babc50468..0a2f7ef56 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 9713f33af..8fa33d515 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.2 diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index 6dad94bad..46388e575 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -66,7 +66,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 && \ + php:8.3 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 4f0c460af..7af18dea0 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -59,7 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "ol9_appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 && \ + php:8.3 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-apache-pgsql/centos/Dockerfile b/Dockerfiles/web-apache-pgsql/centos/Dockerfile index 9d0cd2f50..2d1390e5e 100644 --- a/Dockerfiles/web-apache-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/centos/Dockerfile @@ -66,7 +66,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ + php:8.3 \ postgresql:16 && \ microdnf -y install \ --disablerepo "*" \ diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 0d0778b20..47771d11b 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -59,7 +59,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "ol9_appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ + php:8.3 \ postgresql:16 && \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/web-nginx-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index 85891990c..56397528e 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -57,8 +57,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ - nginx:1.24 && \ + php:8.3 \ + nginx:1.26 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "extras-common" \ diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index e83d86aed..779e15f15 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -57,8 +57,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "ol9_appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ - nginx:1.24 && \ + php:8.4 \ + nginx:1.26 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index b3a388579..bc44268f3 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 @@ -81,8 +81,8 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ - nginx:1.24 && \ + php:8.3 \ + nginx:1.26 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index 073731d96..d763ad8ee 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -64,9 +64,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ + php:8.3 \ postgresql:16 \ - nginx:1.24 && \ + nginx:1.26 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "baseos" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index b95bc511f..9249f516a 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -57,9 +57,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "ol9_appstream" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ + php:8.3 \ postgresql:16 \ - nginx:1.24 && \ + nginx:1.26 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index ec3a1ca3a..2b97935f6 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 @@ -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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION @@ -82,9 +82,9 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ --enablerepo "rhel-9-for-$ARCH_SUFFIX-appstream-rpms" \ --setopt=install_weak_deps=0 \ --setopt=keepcache=0 \ - php:8.2 \ + php:8.3 \ postgresql:16 \ - nginx:1.24 && \ + nginx:1.26 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-9-baseos-rpms" \ diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index a507110af..ab08454d9 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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 ARG MAJOR_VERSION=7.2 ARG RELEASE=15 ARG ZBX_VERSION=${MAJOR_VERSION}.15 @@ -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.6 +ARG OS_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.7 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION