From 7867d0dac65c7bdfcf3a849500b85adf058f36a8 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 21 May 2025 22:19:02 +0900 Subject: [PATCH] Updated RHEL to 9.6 --- .env | 2 +- Dockerfiles/agent/rhel/Dockerfile | 2 +- Dockerfiles/agent2/rhel/Dockerfile | 2 +- Dockerfiles/build-base/rhel/Dockerfile | 2 +- Dockerfiles/java-gateway/rhel/Dockerfile | 2 +- Dockerfiles/proxy-mysql/rhel/Dockerfile | 2 +- Dockerfiles/proxy-sqlite3/rhel/Dockerfile | 2 +- Dockerfiles/server-mysql/rhel/Dockerfile | 2 +- Dockerfiles/server-pgsql/rhel/Dockerfile | 2 +- Dockerfiles/snmptraps/rhel/Dockerfile | 2 +- Dockerfiles/web-nginx-mysql/rhel/Dockerfile | 2 +- Dockerfiles/web-nginx-pgsql/rhel/Dockerfile | 4 ++-- Dockerfiles/web-service/rhel/Dockerfile | 4 ++-- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 2510b6f7a..04fc9ca38 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/ubi9/ubi-minimal:9.6 # Base images BUILD_BASE_IMAGE=zabbix-build-base diff --git a/Dockerfiles/agent/rhel/Dockerfile b/Dockerfiles/agent/rhel/Dockerfile index af7e718c6..0f7bc23e8 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/agent2/rhel/Dockerfile b/Dockerfiles/agent2/rhel/Dockerfile index 807e1aaa9..741029989 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/build-base/rhel/Dockerfile b/Dockerfiles/build-base/rhel/Dockerfile index 75c2cb593..6aef7cc80 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/ubi9/ubi-minimal:9.6 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 diff --git a/Dockerfiles/java-gateway/rhel/Dockerfile b/Dockerfiles/java-gateway/rhel/Dockerfile index 5c8d1d0da..de5f67d37 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/proxy-mysql/rhel/Dockerfile b/Dockerfiles/proxy-mysql/rhel/Dockerfile index 1dc0187d7..1974f6706 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/proxy-sqlite3/rhel/Dockerfile b/Dockerfiles/proxy-sqlite3/rhel/Dockerfile index 49caa4120..1bb9c77b1 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/server-mysql/rhel/Dockerfile b/Dockerfiles/server-mysql/rhel/Dockerfile index 30190b6f1..7f7da9225 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/server-pgsql/rhel/Dockerfile b/Dockerfiles/server-pgsql/rhel/Dockerfile index 632af951b..0519c50e7 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/snmptraps/rhel/Dockerfile b/Dockerfiles/snmptraps/rhel/Dockerfile index 171310fb4..a4bedb448 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/ubi9/ubi-minimal:9.6 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.0 diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index 9130ac8e8..74db6ded8 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 diff --git a/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile b/Dockerfiles/web-nginx-pgsql/rhel/Dockerfile index 86219ff3e..ff1f6e2dc 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 @@ -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/ubi9/ubi-minimal:9.6 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION diff --git a/Dockerfiles/web-service/rhel/Dockerfile b/Dockerfiles/web-service/rhel/Dockerfile index af9da0d2f..294dd9758 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/ubi9/ubi-minimal:9.6 ARG MAJOR_VERSION=7.0 ARG RELEASE=13 ARG ZBX_VERSION=${MAJOR_VERSION}.13 @@ -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/ubi9/ubi-minimal:9.6 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION