From d64391f2be679d19717b2dacc3b16e40a67b9a31 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Fri, 24 Apr 2026 13:58:33 +0900 Subject: [PATCH] Update Ubuntu to 26.04 (resolute) --- Dockerfiles/agent/README.md | 2 +- Dockerfiles/agent/ubuntu/Dockerfile | 2 +- Dockerfiles/agent2/README.md | 2 +- Dockerfiles/agent2/ubuntu/Dockerfile | 2 +- Dockerfiles/build-base/README.md | 2 +- Dockerfiles/build-base/ubuntu/Dockerfile | 6 +-- Dockerfiles/build-mysql/README.md | 2 +- Dockerfiles/build-pgsql/README.md | 2 +- Dockerfiles/build-sqlite3/README.md | 2 +- Dockerfiles/java-gateway/README.md | 2 +- Dockerfiles/java-gateway/ubuntu/Dockerfile | 2 +- Dockerfiles/proxy-mysql/README.md | 2 +- Dockerfiles/proxy-mysql/ubuntu/Dockerfile | 7 +-- Dockerfiles/proxy-sqlite3/README.md | 2 +- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 5 +- Dockerfiles/server-mysql/README.md | 2 +- Dockerfiles/server-mysql/ubuntu/Dockerfile | 7 +-- Dockerfiles/server-pgsql/README.md | 2 +- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 25 ++------- Dockerfiles/snmptraps/README.md | 2 +- Dockerfiles/snmptraps/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/README.md | 2 +- .../web-apache-mysql/ubuntu/Dockerfile | 30 +++++------ .../etc/php/{8.3 => 8.5}/fpm/php-fpm.conf | 2 +- .../php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf | 0 Dockerfiles/web-apache-pgsql/README.md | 2 +- .../web-apache-pgsql/ubuntu/Dockerfile | 49 ++++++------------ .../etc/php/{8.3 => 8.5}/fpm/php-fpm.conf | 2 +- .../php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf | 0 Dockerfiles/web-nginx-mysql/README.md | 2 +- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 32 ++++++------ .../etc/php/{8.3 => 8.5}/fpm/php-fpm.conf | 2 +- .../php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf | 0 .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 4 +- Dockerfiles/web-nginx-pgsql/README.md | 2 +- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 51 +++++++------------ .../etc/php/{8.3 => 8.5}/fpm/php-fpm.conf | 2 +- .../php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf | 0 .../ubuntu/conf/etc/zabbix/nginx_ssl.conf | 4 +- Dockerfiles/web-service/README.md | 2 +- Dockerfiles/web-service/ubuntu/Dockerfile | 10 ++-- .../conf/etc/apt/preferences.d/chromium.pref | 2 +- Makefile | 4 +- 43 files changed, 121 insertions(+), 165 deletions(-) rename Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/php-fpm.conf (70%) rename Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf (100%) rename Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/php-fpm.conf (70%) rename Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/php-fpm.conf (70%) rename Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/php-fpm.conf (70%) rename Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/{8.3 => 8.5}/fpm/pool.d/zabbix.conf (100%) diff --git a/Dockerfiles/agent/README.md b/Dockerfiles/agent/README.md index 006165ff..580baf37 100644 --- a/Dockerfiles/agent/README.md +++ b/Dockerfiles/agent/README.md @@ -14,7 +14,7 @@ Zabbix agent is deployed on a monitoring target to actively monitor local resour # Zabbix agent images -These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are: +These are the only official Zabbix agent Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are: Zabbix agent 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix agent 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*) diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index c7d145e6..a027e2fd 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} diff --git a/Dockerfiles/agent2/README.md b/Dockerfiles/agent2/README.md index ab906a38..97758a69 100644 --- a/Dockerfiles/agent2/README.md +++ b/Dockerfiles/agent2/README.md @@ -14,7 +14,7 @@ Zabbix agent 2 is deployed on a monitoring target to actively monitor local reso # Zabbix agent 2 images -These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are: +These are the only official Zabbix agent 2 Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10, Oracle Linux 10, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are: Zabbix agent 2 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix agent 2 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*, ltsc2019-6.0.*, ltsc2022-6.0.*) diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 5ee4d0c3..512dd25b 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} diff --git a/Dockerfiles/build-base/README.md b/Dockerfiles/build-base/README.md index 68a968f9..4e14a443 100644 --- a/Dockerfiles/build-base/README.md +++ b/Dockerfiles/build-base/README.md @@ -14,7 +14,7 @@ Zabbix build base image is prepared build environment for building Zabbix compon # Zabbix build base images -These are the only official Zabbix build base Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: +These are the only official Zabbix build base Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 907d0551..35713dc5 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.4 @@ -7,7 +7,7 @@ ARG ZBX_VERSION=${MAJOR_VERSION}.9 ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ - PATH=/usr/lib/go-1.24/bin:$PATH \ + PATH=/usr/lib/go-1.26/bin:$PATH \ GOPATH=/root/go \ GOCACHE=/root/.cache/go-build \ GOMODCACHE=/root/go/pkg/mod \ @@ -54,7 +54,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ pkg-config \ gettext \ git \ - golang-1.24 \ + golang-1.26 \ unzip \ unixodbc-dev \ zlib1g-dev" && \ diff --git a/Dockerfiles/build-mysql/README.md b/Dockerfiles/build-mysql/README.md index 77a22a4c..86616d2a 100644 --- a/Dockerfiles/build-mysql/README.md +++ b/Dockerfiles/build-mysql/README.md @@ -14,7 +14,7 @@ Zabbix build base (MySQL) image is used for building Zabbix components. It conta # Zabbix build base (MySQL) images -These are the only official Zabbix build base (MySQL) Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: +These are the only official Zabbix build base (MySQL) Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/build-pgsql/README.md b/Dockerfiles/build-pgsql/README.md index 18ad81d2..a23b6f7d 100644 --- a/Dockerfiles/build-pgsql/README.md +++ b/Dockerfiles/build-pgsql/README.md @@ -14,7 +14,7 @@ Zabbix build base (PostgreSQL) image is used for building Zabbix components. It # Zabbix build base (PostgreSQL) images -These are the only official Zabbix build base (PostgreSQL) Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: +These are the only official Zabbix build base (PostgreSQL) Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/build-sqlite3/README.md b/Dockerfiles/build-sqlite3/README.md index 06fdf17a..4cac242d 100644 --- a/Dockerfiles/build-sqlite3/README.md +++ b/Dockerfiles/build-sqlite3/README.md @@ -14,7 +14,7 @@ Zabbix build base (SQLite3) image is used for building Zabbix components. It con # Zabbix build base (SQLite3) images -These are the only official Zabbix build base (SQLite3) Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: +These are the only official Zabbix build base (SQLite3) Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of the image are: Zabbix build base 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix build base 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/java-gateway/README.md b/Dockerfiles/java-gateway/README.md index 4ae30389..79ec1c0d 100644 --- a/Dockerfiles/java-gateway/README.md +++ b/Dockerfiles/java-gateway/README.md @@ -14,7 +14,7 @@ Zabbix Java Gateway performs native support for monitoring JMX applications. Jav # Zabbix Java Gateway images -These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix Java Gateway are: +These are the only official Zabbix Java Gateway Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix Java Gateway 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index e73a818f..10903b9c 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index 92e3b254..a908a13c 100644 --- a/Dockerfiles/proxy-mysql/README.md +++ b/Dockerfiles/proxy-mysql/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 3d4c43e6..819eafdf 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} @@ -62,18 +62,19 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ca-certificates \ fping \ openssl \ + libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ libevent-extra-2.1 \ - libmysqlclient21 \ + libmysqlclient24 \ libopenipmi0t64 \ libpcre2-8-0 \ libsnmp40t64 \ libssh-4 \ libssl3t64 \ - libxml2 \ + libxml2-16 \ mysql-client \ snmp-mibs-downloader \ gzip \ diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md index 6bbb24c4..4a10eed0 100644 --- a/Dockerfiles/proxy-sqlite3/README.md +++ b/Dockerfiles/proxy-sqlite3/README.md @@ -14,7 +14,7 @@ Zabbix proxy is a process that may collect monitoring data from one or more moni # Zabbix proxy images -These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix proxy are: Zabbix proxy 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix proxy 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index 814f98fd..d36bdb8c 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} @@ -59,6 +59,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ca-certificates \ fping \ openssl \ + libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ @@ -70,7 +71,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libsqlite3-0 \ libssh-4 \ libssl3t64 \ - libxml2 \ + libxml2-16 \ snmp-mibs-downloader \ unixodbc \ zlib1g" && \ diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index 59bf1e07..1b1acc56 100644 --- a/Dockerfiles/server-mysql/README.md +++ b/Dockerfiles/server-mysql/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 518db5d0..889db8eb 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} @@ -62,18 +62,19 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ iputils-ping \ fping \ openssl \ + libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ libevent-pthreads-2.1 \ libevent-extra-2.1 \ - libmysqlclient21 \ + libmysqlclient24 \ libopenipmi0t64 \ libpcre2-8-0 \ libsnmp40t64 \ libssh-4 \ libssl3t64 \ - libxml2 \ + libxml2-16 \ mysql-client \ snmp-mibs-downloader \ gzip \ diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 2afa8eb9..90ce0ea9 100644 --- a/Dockerfiles/server-pgsql/README.md +++ b/Dockerfiles/server-pgsql/README.md @@ -16,7 +16,7 @@ The server performs the polling and trapping of data, it calculates triggers, se # Zabbix server images -These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix server are: Zabbix server 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix server 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 965fc882..151f23ef 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} @@ -61,6 +61,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ iputils-ping \ fping \ openssl \ + libc6 \ libcares2 \ libcurl4t64 \ libevent-2.1 \ @@ -72,36 +73,18 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ libsnmp40t64 \ libssh-4 \ libssl3t64 \ - libxml2 \ - postgresql-client-17 \ + libxml2-16 \ + postgresql-client \ snmp-mibs-downloader \ gzip \ unixodbc \ zlib1g" && \ apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ca-certificates \ - curl \ - gnupg && \ - curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \ - | gpg --dearmor -o /usr/share/keyrings/postgresql.gpg && \ - . /etc/os-release && \ - echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" \ - > /etc/apt/sources.list.d/pgdg.list && \ - apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ --no-install-recommends install \ ${INSTALL_PKGS} && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - purge \ - curl \ - gnupg && \ - apt-get -y autoremove && \ groupadd \ --system \ --gid 1995 \ diff --git a/Dockerfiles/snmptraps/README.md b/Dockerfiles/snmptraps/README.md index 55b71f40..7eb51928 100644 --- a/Dockerfiles/snmptraps/README.md +++ b/Dockerfiles/snmptraps/README.md @@ -14,7 +14,7 @@ The image is used to receive SNMP traps, store them to a log file and provide ac # Zabbix snmptraps images -These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix snmptraps 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index d0d87981..52c310be 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute FROM ${OS_BASE_IMAGE} ARG MAJOR_VERSION=7.4 diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md index 88456794..70956e76 100644 --- a/Dockerfiles/web-apache-mysql/README.md +++ b/Dockerfiles/web-apache-mysql/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index a96198b4..67f90cce 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} @@ -36,12 +36,12 @@ ENV DB_ENGINE=mysql \ DAEMON_USER=www-data \ DAEMON_GROUP=www-data \ APACHE_BIN=/usr/sbin/apache2 \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.3 \ + PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ APACHE_RUN_DIR=/tmp/apache2 \ HTTPD_CONF_FILE=/etc/apache2/apache2.conf \ APACHE_SITES_DIR=/etc/apache2/sites-enabled \ - PHP_FPM_CONFIG=/etc/php/8.3/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.3/fpm/pool.d/zabbix.conf + PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ + PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \ @@ -72,14 +72,14 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ apache2 \ locales \ libldap-common \ - php8.3-bcmath \ - php8.3-curl \ - php8.3-fpm \ - php8.3-gd \ - php8.3-ldap \ - php8.3-mbstring \ - php8.3-mysql \ - php8.3-xml \ + php8.5-bcmath \ + php8.5-curl \ + php8.5-fpm \ + php8.5-gd \ + php8.5-ldap \ + php8.5-mbstring \ + php8.5-mysql \ + php8.5-xml \ jq" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ @@ -110,7 +110,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ /var/lib/locales/supported.d && \ rm -rf /etc/apache2/sites-available/* \ ${APACHE_SITES_DIR}/*.conf \ - /etc/php/8.3/fpm/pool.d/www.conf \ + /etc/php/8.5/fpm/pool.d/www.conf \ /var/run/apache2/ \ /var/lib/locales/supported.d/local && \ ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ @@ -125,8 +125,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ${ZABBIX_WWW_ROOT}/modules/ \ ${ZABBIX_USER_HOME_DIR}/ \ /etc/apache2/ \ - /etc/php/8.3/fpm/php-fpm.conf \ - /etc/php/8.3/fpm/pool.d/ \ + /etc/php/8.5/fpm/php-fpm.conf \ + /etc/php/8.5/fpm/pool.d/ \ /var/lib/php/session/" && \ chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ chmod -R g=u ${FIX_PERM_LIST} diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf similarity index 70% rename from Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf index 5311405b..a2ae51f4 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.3/fpm/pool.d/*.conf +include=/etc/php/8.5/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md index 4df9a25c..7098b8d3 100644 --- a/Dockerfiles/web-apache-pgsql/README.md +++ b/Dockerfiles/web-apache-pgsql/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index e66a39c2..f62ee3fd 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} @@ -35,12 +35,12 @@ ENV TERM=xterm \ ENV DAEMON_USER=www-data \ DAEMON_GROUP=www-data \ APACHE_BIN=/usr/sbin/apache2 \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.3 \ + PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ APACHE_RUN_DIR=/tmp/apache2 \ HTTPD_CONF_FILE=/etc/apache2/apache2.conf \ APACHE_SITES_DIR=/etc/apache2/sites-enabled \ - PHP_FPM_CONFIG=/etc/php/8.3/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.3/fpm/pool.d/zabbix.conf + PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ + PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with PostgreSQL database support" \ @@ -70,39 +70,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ apache2 \ locales \ libldap-common \ - php8.3-bcmath \ - php8.3-curl \ - php8.3-fpm \ - php8.3-gd \ - php8.3-ldap \ - php8.3-mbstring \ - php8.3-xml \ - php8.3-pgsql \ - postgresql-client-17 \ + php8.5-bcmath \ + php8.5-curl \ + php8.5-fpm \ + php8.5-gd \ + php8.5-ldap \ + php8.5-mbstring \ + php8.5-xml \ + php8.5-pgsql \ + postgresql-client \ jq" && \ apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ca-certificates \ - curl \ - gnupg && \ - curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \ - | gpg --dearmor -o /usr/share/keyrings/postgresql.gpg && \ - . /etc/os-release && \ - echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" \ - > /etc/apt/sources.list.d/pgdg.list && \ - apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ --no-install-recommends install \ ${INSTALL_PKGS} && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - purge \ - gnupg && \ - apt-get -y autoremove && \ groupadd \ --system \ --gid 1995 \ @@ -126,7 +109,7 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ /var/lib/locales/supported.d && \ rm -rf /etc/apache2/sites-available/* \ ${APACHE_SITES_DIR}/*.conf \ - /etc/php/8.3/fpm/pool.d/www.conf \ + /etc/php/8.5/fpm/pool.d/www.conf \ /var/run/apache2/ \ /var/lib/locales/supported.d/local && \ ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ @@ -141,8 +124,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ${ZABBIX_WWW_ROOT}/modules/ \ ${ZABBIX_USER_HOME_DIR}/ \ /etc/apache2/ \ - /etc/php/8.3/fpm/php-fpm.conf \ - /etc/php/8.3/fpm/pool.d/ \ + /etc/php/8.5/fpm/php-fpm.conf \ + /etc/php/8.5/fpm/pool.d/ \ /var/lib/php/session/" && \ chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ chmod -R g=u ${FIX_PERM_LIST} diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf similarity index 70% rename from Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf index 5311405b..a2ae51f4 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.3/fpm/pool.d/*.conf +include=/etc/php/8.5/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md index 9d02c678..026cfced 100644 --- a/Dockerfiles/web-nginx-mysql/README.md +++ b/Dockerfiles/web-nginx-mysql/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index 3fe683cd..18672ff6 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} @@ -36,10 +36,10 @@ ENV DB_ENGINE=mysql \ DAEMON_USER=www-data \ DAEMON_GROUP=www-data \ NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.3 \ + PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php/8.3/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.3/fpm/pool.d/zabbix.conf + PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ + PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \ @@ -70,14 +70,14 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ nginx \ locales \ libldap-common \ - php8.3-bcmath \ - php8.3-curl \ - php8.3-fpm \ - php8.3-gd \ - php8.3-ldap \ - php8.3-mbstring \ - php8.3-mysql \ - php8.3-xml \ + php8.5-bcmath \ + php8.5-curl \ + php8.5-fpm \ + php8.5-gd \ + php8.5-ldap \ + php8.5-mbstring \ + php8.5-mysql \ + php8.5-xml \ jq" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ @@ -109,8 +109,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ rm -rf \ /etc/nginx/conf.d/*.conf \ /var/cache/nginx/ \ - /etc/php/8.3/fpm/pool.d/www.conf \ - /etc/php/8.3/fpm/php-fpm.conf.dpkg-dist \ + /etc/php/8.5/fpm/pool.d/www.conf \ + /etc/php/8.5/fpm/php-fpm.conf.dpkg-dist \ /var/lib/locales/supported.d/local && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ @@ -126,8 +126,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ${ZABBIX_WWW_ROOT}/modules/ \ ${ZABBIX_USER_HOME_DIR}/ \ /etc/nginx/ \ - /etc/php/8.3/fpm/php-fpm.conf \ - /etc/php/8.3/fpm/pool.d/ \ + /etc/php/8.5/fpm/php-fpm.conf \ + /etc/php/8.5/fpm/pool.d/ \ /var/lib/php/session/" && \ chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ chmod -R g=u ${FIX_PERM_LIST} diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf similarity index 70% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf index 5311405b..a2ae51f4 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.3/fpm/pool.d/*.conf +include=/etc/php/8.5/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 93da8e86..01fbf7b4 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -1,7 +1,9 @@ server { - listen 8443 ssl http2; + listen 8443 ssl; include /etc/nginx/includes/listen-ipv6-ssl.conf; + http2 on; + include /etc/nginx/includes/real-ip.conf; include /etc/nginx/includes/server-ssl.conf; include /etc/nginx/includes/server-common.conf; diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md index f11a6624..68c629c9 100644 --- a/Dockerfiles/web-nginx-pgsql/README.md +++ b/Dockerfiles/web-nginx-pgsql/README.md @@ -14,7 +14,7 @@ Zabbix web interface is a part of Zabbix software. It is used to manage resource # Zabbix web interface images -These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: +These are the only official Zabbix web interface Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web interface are: Zabbix web interface 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix web interface 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 21c9930d..6b066550 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} @@ -35,10 +35,10 @@ ENV TERM=xterm \ ENV DAEMON_USER=www-data \ DAEMON_GROUP=www-data \ NGINX_BIN=/usr/sbin/nginx \ - PHP_FPM_BIN=/usr/sbin/php-fpm8.3 \ + PHP_FPM_BIN=/usr/sbin/php-fpm8.5 \ NGINX_CONFD_DIR=/etc/nginx/conf.d \ - PHP_FPM_CONFIG=/etc/php/8.3/fpm/php-fpm.conf \ - PHP_ZBX_CONFIG_FILE=/etc/php/8.3/fpm/pool.d/zabbix.conf + PHP_FPM_CONFIG=/etc/php/8.5/fpm/php-fpm.conf \ + PHP_ZBX_CONFIG_FILE=/etc/php/8.5/fpm/pool.d/zabbix.conf LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \ @@ -68,39 +68,22 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ nginx \ locales \ libldap-common \ - php8.3-bcmath \ - php8.3-curl \ - php8.3-fpm \ - php8.3-gd \ - php8.3-ldap \ - php8.3-mbstring \ - php8.3-xml \ - php8.3-pgsql \ - postgresql-client-17 \ + php8.5-bcmath \ + php8.5-curl \ + php8.5-fpm \ + php8.5-gd \ + php8.5-ldap \ + php8.5-mbstring \ + php8.5-xml \ + php8.5-pgsql \ + postgresql-client \ jq" && \ apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - -o Dpkg::Options::="--force-confdef" \ - -o Dpkg::Options::="--force-confold" \ - --no-install-recommends install \ - ca-certificates \ - curl \ - gnupg && \ - curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \ - | gpg --dearmor -o /usr/share/keyrings/postgresql.gpg && \ - . /etc/os-release && \ - echo "deb [signed-by=/usr/share/keyrings/postgresql.gpg] https://apt.postgresql.org/pub/repos/apt ${VERSION_CODENAME}-pgdg main" \ - > /etc/apt/sources.list.d/pgdg.list && \ - apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ -o Dpkg::Options::="--force-confold" \ --no-install-recommends install \ ${INSTALL_PKGS} && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - purge \ - gnupg && \ - apt-get -y autoremove && \ groupadd \ --system \ --gid 1995 \ @@ -125,8 +108,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ rm -rf \ /etc/nginx/conf.d/*.conf \ /var/cache/nginx/ \ - /etc/php/8.3/fpm/pool.d/www.conf \ - /etc/php/8.3/fpm/php-fpm.conf.dpkg-dist && \ + /etc/php/8.5/fpm/pool.d/www.conf \ + /etc/php/8.5/fpm/php-fpm.conf.dpkg-dist && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \ @@ -142,8 +125,8 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ ${ZABBIX_WWW_ROOT}/modules/ \ ${ZABBIX_USER_HOME_DIR}/ \ /etc/nginx/ \ - /etc/php/8.3/fpm/php-fpm.conf \ - /etc/php/8.3/fpm/pool.d/ \ + /etc/php/8.5/fpm/php-fpm.conf \ + /etc/php/8.5/fpm/pool.d/ \ /var/lib/php/session/" && \ chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \ chmod -R g=u ${FIX_PERM_LIST} diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf similarity index 70% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf index 5311405b..a2ae51f4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.3/fpm/pool.d/*.conf +include=/etc/php/8.5/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.5/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf index 93da8e86..01fbf7b4 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/zabbix/nginx_ssl.conf @@ -1,7 +1,9 @@ server { - listen 8443 ssl http2; + listen 8443 ssl; include /etc/nginx/includes/listen-ipv6-ssl.conf; + http2 on; + include /etc/nginx/includes/real-ip.conf; include /etc/nginx/includes/server-ssl.conf; include /etc/nginx/includes/server-common.conf; diff --git a/Dockerfiles/web-service/README.md b/Dockerfiles/web-service/README.md index 8118c2b2..c5c984ef 100644 --- a/Dockerfiles/web-service/README.md +++ b/Dockerfiles/web-service/README.md @@ -14,7 +14,7 @@ Zabbix web service for performing various tasks using headless web browser (for # Zabbix web service images -These are the only official Zabbix web service Docker images. They are based on Alpine Linux v3.23, Ubuntu 24.04 (noble), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web service are: +These are the only official Zabbix web service Docker images. They are based on Alpine Linux v3.23, Ubuntu 26.04 (resolute), CentOS Stream 10 and Oracle Linux 10 images. The available versions of Zabbix web service are: Zabbix web service 6.0 (tags: alpine-6.0-latest, ubuntu-6.0-latest, ol-6.0-latest) Zabbix web service 6.0.* (tags: alpine-6.0.*, ubuntu-6.0.*, ol-6.0.*) diff --git a/Dockerfiles/web-service/ubuntu/Dockerfile b/Dockerfiles/web-service/ubuntu/Dockerfile index 80d8fbd5..83a92a71 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.6 -ARG OS_BASE_IMAGE=ubuntu:noble +ARG OS_BASE_IMAGE=ubuntu:resolute ARG MAJOR_VERSION=7.4 ARG ZBX_VERSION=${MAJOR_VERSION}.9 ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} @@ -48,10 +48,10 @@ RUN --mount=type=cache,target=/var/cache/apt/,sharing=locked \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ ${INSTALL_TEMP_PKGS} && \ - gpg --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 && \ - gpg -o /etc/apt/keyrings/debian.gpg --export 0E98404D386FA1D9 && \ - echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/debian.list && \ - echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian bullseye-updates main" >> /etc/apt/sources.list.d/debian.list && \ + gpg --keyserver keyserver.ubuntu.com --recv-keys 78DBA3BC47EF2265 && \ + gpg -o /etc/apt/keyrings/debian.gpg --export 78DBA3BC47EF2265 && \ + echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian trixie main" > /etc/apt/sources.list.d/debian.list && \ + echo "deb [signed-by=/etc/apt/keyrings/debian.gpg] http://deb.debian.org/debian trixie-updates main" >> /etc/apt/sources.list.d/debian.list && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ diff --git a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref index 48609ef4..c02c6dfe 100644 --- a/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref +++ b/Dockerfiles/web-service/ubuntu/conf/etc/apt/preferences.d/chromium.pref @@ -1,6 +1,6 @@ # Note: 2 blank lines are required between entries Package: * -Pin: release a=focal +Pin: release a=resolute Pin-Priority: 500 Package: * diff --git a/Makefile b/Makefile index c62f21ab..0e2c7d11 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ PLATFORMS ?= ALPINE_BASE_IMAGE ?= alpine:3.23 CENTOS_BASE_IMAGE ?= quay.io/centos/centos:stream10-minimal OL_BASE_IMAGE ?= container-registry.oracle.com/os/oraclelinux:10-slim -UBUNTU_BASE_IMAGE ?= ubuntu:noble +UBUNTU_BASE_IMAGE ?= ubuntu:resolute RHEL_BASE_IMAGE ?= registry.access.redhat.com/ubi10/ubi-minimal:10.1 # Auto-select base image by OS (unless explicitly overridden) @@ -149,7 +149,7 @@ help: @echo " make build DB=mysql" @echo " make build DB=pgsql" @echo " make builders DB=sqlite3" - @echo " make build OS=ubuntu OS_BASE_IMAGE=ubuntu:noble" + @echo " make build OS=ubuntu OS_BASE_IMAGE=ubuntu:resolute" @echo " make build PLATFORMS=linux/amd64,linux/arm64" @echo " make build LOCAL_IMAGE_PREFIX=ghcr.io/zabbix/" @echo ""