diff --git a/.env b/.env index 11be83ce7..79803ffa8 100644 --- a/.env +++ b/.env @@ -70,7 +70,7 @@ ENV_VARS_DIRECTORY=./env_vars RESTART_POLICY=unless-stopped # Cache base images -ALPINE_BASE_IMAGE=alpine:3.21 +ALPINE_BASE_IMAGE=alpine:3.22 CENTOS_BASE_IMAGE=quay.io/centos/centos:stream9-minimal OL_BASE_IMAGE=oraclelinux:9-slim UBUNTU_BASE_IMAGE=ubuntu:noble diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index ac07f05c3..b0b00cc02 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 86bbc1942..851ec1aa7 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 565eb56d5..cc296a785 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index 81457287d..880bdb76e 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index dcde943af..d448e6629 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 5ebe3b242..f5e4cbf95 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index dabff1903..5be39fb07 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 4a484af91..cdaeef398 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index 14d88ed3b..bfef72219 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=6.0 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index b8510ca5b..c85664d09 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/web-apache-mysql/ol/Dockerfile b/Dockerfiles/web-apache-mysql/ol/Dockerfile index 390be7a7a..cd3317bee 100644 --- a/Dockerfiles/web-apache-mysql/ol/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ol/Dockerfile @@ -58,7 +58,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/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index f48d6b7f9..b86211f33 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/web-apache-pgsql/ol/Dockerfile b/Dockerfiles/web-apache-pgsql/ol/Dockerfile index 0c004e2fa..3f535fe2c 100644 --- a/Dockerfiles/web-apache-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ol/Dockerfile @@ -58,7 +58,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/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index c641ba553..d68d133a2 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index bc48b2dd7..44db6e0f3 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -56,8 +56,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.3 \ + nginx:1.26 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol9_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index b1e92b5c6..4322f4d9b 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 5f6da44ee..a766a29cc 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -58,9 +58,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-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index e67db8ff6..3bddade78 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG OS_BASE_IMAGE=alpine:3.21 +ARG OS_BASE_IMAGE=alpine:3.22 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.43 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION}