From 599e7ab4b9e61b682e6cca29ee15bda0776ba505 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Wed, 24 Apr 2024 02:18:27 +0900 Subject: [PATCH] Updated Ubuntu to 24.04 --- .env | 2 +- 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 | 2 +- Dockerfiles/proxy-sqlite3/README.md | 2 +- Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile | 2 +- Dockerfiles/server-mysql/README.md | 2 +- Dockerfiles/server-mysql/ubuntu/Dockerfile | 2 +- Dockerfiles/server-pgsql/README.md | 2 +- Dockerfiles/server-pgsql/ubuntu/Dockerfile | 2 +- Dockerfiles/snmptraps/README.md | 2 +- Dockerfiles/snmptraps/ubuntu/Dockerfile | 2 +- Dockerfiles/web-apache-mysql/README.md | 2 +- .../web-apache-mysql/ubuntu/Dockerfile | 20 ++++---- .../{8.1 => 8.3}/apache2/conf.d/99-zabbix.ini | 0 .../ubuntu/conf/etc/zabbix/apache_envvars | 4 ++ .../ubuntu/docker-entrypoint.sh | 2 + Dockerfiles/web-apache-pgsql/README.md | 2 +- .../web-apache-pgsql/ubuntu/Dockerfile | 20 ++++---- .../{8.1 => 8.3}/apache2/conf.d/99-zabbix.ini | 0 .../ubuntu/conf/etc/zabbix/apache_envvars | 4 ++ .../ubuntu/docker-entrypoint.sh | 2 + Dockerfiles/web-nginx-mysql/README.md | 2 +- Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile | 49 +++++-------------- .../ubuntu/conf/etc/nginx/nginx.conf | 2 +- .../etc/php/{8.1 => 8.3}/fpm/php-fpm.conf | 2 +- .../php/{8.1 => 8.3}/fpm/pool.d/zabbix.conf | 0 .../supervisor/conf.d/supervisord_zabbix.conf | 4 +- .../ubuntu/docker-entrypoint.sh | 2 +- Dockerfiles/web-nginx-pgsql/README.md | 2 +- Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile | 44 +++++------------ .../ubuntu/conf/etc/nginx/nginx.conf | 2 +- .../etc/php/{8.1 => 8.3}/fpm/php-fpm.conf | 2 +- .../php/{8.1 => 8.3}/fpm/pool.d/zabbix.conf | 0 .../supervisor/conf.d/supervisord_zabbix.conf | 4 +- .../ubuntu/docker-entrypoint.sh | 2 +- Dockerfiles/web-service/README.md | 2 +- Dockerfiles/web-service/ubuntu/Dockerfile | 2 +- 48 files changed, 98 insertions(+), 127 deletions(-) rename Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/{8.1 => 8.3}/apache2/conf.d/99-zabbix.ini (100%) create mode 100644 Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars rename Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/{8.1 => 8.3}/apache2/conf.d/99-zabbix.ini (100%) create mode 100644 Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars rename Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/{8.1 => 8.3}/fpm/php-fpm.conf (65%) rename Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/{8.1 => 8.3}/fpm/pool.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/{8.1 => 8.3}/fpm/php-fpm.conf (65%) rename Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/{8.1 => 8.3}/fpm/pool.d/zabbix.conf (100%) diff --git a/.env b/.env index 6168d9fce..05c8ba84f 100644 --- a/.env +++ b/.env @@ -65,7 +65,7 @@ RESTART_POLICY=unless-stopped ALPINE_CACHE_FROM=alpine:3.19 CENTOS_CACHE_FROM=quay.io/centos/centos:stream9 OL_CACHE_FROM=oraclelinux:9-slim -UBUNTU_CACHE_FROM=ubuntu:jammy +UBUNTU_CACHE_FROM=ubuntu:noble RHEL_CACHE_FROM=registry.access.redhat.com/ubi9/ubi-minimal:9.3 # Base images diff --git a/Dockerfiles/agent/README.md b/Dockerfiles/agent/README.md index b1b33d86e..59359d800 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9, Oracle Linux 9, 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.19, Ubuntu 24.04 (noble), CentOS Stream 9, Oracle Linux 9, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent are: Zabbix agent 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest, ltsc2019-5.0-latest, ltsc2022-5.0-latest) Zabbix agent 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*, ltsc2019-5.0.*, ltsc2022-5.0.*) diff --git a/Dockerfiles/agent/ubuntu/Dockerfile b/Dockerfiles/agent/ubuntu/Dockerfile index 85717962a..9a6405392 100644 --- a/Dockerfiles/agent/ubuntu/Dockerfile +++ b/Dockerfiles/agent/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/README.md b/Dockerfiles/agent2/README.md index 687dccc64..782365a6f 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9, Oracle Linux 9, 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.19, Ubuntu 24.04 (noble), CentOS Stream 9, Oracle Linux 9, Windows 10 LTSC 2019 and Windows 11 LTSC 2022 images. The available versions of Zabbix agent 2 are: Zabbix agent 2 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest , ltsc2019-5.0-latest, ltsc2022-5.0-latest) Zabbix agent 2 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*, ltsc2019-5.0.*, ltsc2022-5.0.*) diff --git a/Dockerfiles/agent2/ubuntu/Dockerfile b/Dockerfiles/agent2/ubuntu/Dockerfile index 7f89fde07..3fae59636 100644 --- a/Dockerfiles/agent2/ubuntu/Dockerfile +++ b/Dockerfiles/agent2/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/README.md b/Dockerfiles/build-base/README.md index 3f6afbc8f..a2ec12f21 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are: Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/build-base/ubuntu/Dockerfile b/Dockerfiles/build-base/ubuntu/Dockerfile index 1429da09f..9ef4da33f 100644 --- a/Dockerfiles/build-base/ubuntu/Dockerfile +++ b/Dockerfiles/build-base/ubuntu/Dockerfile @@ -1,12 +1,12 @@ # syntax=docker/dockerfile:1 -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION} ENV TERM=xterm \ ZBX_VERSION=${ZBX_VERSION} \ - PATH=/usr/lib/go-1.21/bin:$PATH + PATH=/usr/lib/go-1.22/bin:$PATH LABEL org.opencontainers.image.authors="Alexey Pustovalov " \ org.opencontainers.image.description="Zabbix build base image contains all required packages to build Zabbix images" \ @@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ pkg-config \ gettext \ git \ - golang-1.21 \ + golang-1.22 \ unzip \ unixodbc-dev \ zlib1g-dev" && \ diff --git a/Dockerfiles/build-mysql/README.md b/Dockerfiles/build-mysql/README.md index 4c655abb5..18721c6e8 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are: Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/build-pgsql/README.md b/Dockerfiles/build-pgsql/README.md index a9a528946..e67019c7a 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are: Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/build-sqlite3/README.md b/Dockerfiles/build-sqlite3/README.md index a3bc0367c..c3242d209 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of the image are: Zabbix build base 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix build base 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/java-gateway/README.md b/Dockerfiles/java-gateway/README.md index bf37d80e1..320ae187b 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix Java Gateway are: Zabbix Java Gateway 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix Java Gateway 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/java-gateway/ubuntu/Dockerfile b/Dockerfiles/java-gateway/ubuntu/Dockerfile index 5d75a788a..3b1219763 100644 --- a/Dockerfiles/java-gateway/ubuntu/Dockerfile +++ b/Dockerfiles/java-gateway/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/README.md b/Dockerfiles/proxy-mysql/README.md index 246d9049f..47df86dd2 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are: Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile index 792099626..334839e5d 100644 --- a/Dockerfiles/proxy-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-mysql/ubuntu/Dockerfile @@ -6,7 +6,7 @@ ARG ZBX_SOURCES=https://git.zabbix.com/scm/zbx/zabbix.git FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/README.md b/Dockerfiles/proxy-sqlite3/README.md index 5a9dca595..c0c9397fc 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are: +These are the only official Zabbix proxy Docker images. They are based on Alpine Linux v3.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix proxy are: Zabbix proxy 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix proxy 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile index ce21d1492..35c101590 100644 --- a/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/README.md b/Dockerfiles/server-mysql/README.md index a7f2ba812..1e7a59c91 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are: Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/server-mysql/ubuntu/Dockerfile b/Dockerfiles/server-mysql/ubuntu/Dockerfile index 97cbcdc2d..b646ab20d 100644 --- a/Dockerfiles/server-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/server-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/README.md b/Dockerfiles/server-pgsql/README.md index 392eda481..7e93e8716 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are: +These are the only official Zabbix server Docker images. They are based on Alpine Linux v3.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix server are: Zabbix server 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix server 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/server-pgsql/ubuntu/Dockerfile b/Dockerfiles/server-pgsql/ubuntu/Dockerfile index 5a16bbcef..cac2a533a 100644 --- a/Dockerfiles/server-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/server-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/README.md b/Dockerfiles/snmptraps/README.md index 22a75d013..44fb79448 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix snmptraps are: +These are the only official Zabbix snmptraps Docker images. They are based on Alpine Linux v3.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix snmptraps are: Zabbix snmptraps 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix snmptraps 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/snmptraps/ubuntu/Dockerfile b/Dockerfiles/snmptraps/ubuntu/Dockerfile index 5a7ad74f6..1498a7ec7 100644 --- a/Dockerfiles/snmptraps/ubuntu/Dockerfile +++ b/Dockerfiles/snmptraps/ubuntu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION=7.0 ARG ZBX_VERSION=${MAJOR_VERSION} diff --git a/Dockerfiles/web-apache-mysql/README.md b/Dockerfiles/web-apache-mysql/README.md index 747bed00d..ab49fa1ea 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix web interface are: Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile index 88cf994d5..621f6e50a 100644 --- a/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION @@ -41,12 +41,12 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ mysql-client \ locales \ libldap-common \ - php8.1-bcmath \ - php8.1-gd \ - php8.1-ldap \ - php8.1-mbstring \ - php8.1-mysql \ - php8.1-xml" && \ + php8.3-bcmath \ + php8.3-gd \ + php8.3-ldap \ + php8.3-mbstring \ + php8.3-mysql \ + php8.3-xml" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ --no-install-recommends install \ @@ -98,9 +98,9 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.1/ && \ - chgrp -R 0 /etc/apache2/ /etc/php/8.1/ && \ - chmod -R g=u /etc/apache2/ /etc/php/8.1/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.3/ && \ + chgrp -R 0 /etc/apache2/ /etc/php/8.3/ && \ + chmod -R g=u /etc/apache2/ /etc/php/8.3/ && \ apt-get -y autoremove && \ apt-get -y clean diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.1/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/apache2/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.1/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/ubuntu/conf/etc/php/8.3/apache2/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars new file mode 100644 index 000000000..54a63c8c9 --- /dev/null +++ b/Dockerfiles/web-apache-mysql/ubuntu/conf/etc/zabbix/apache_envvars @@ -0,0 +1,4 @@ +export APACHE_RUN_USER=zabbix +export APACHE_RUN_GROUP=zabbix +export APACHE_PID_FILE=/tmp/apache2.pid +export APACHE_RUN_DIR=/tmp diff --git a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh index a1b8c393e..3ed4cf3ca 100755 --- a/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -135,6 +135,8 @@ check_db_connect() { prepare_web_server() { APACHE_SITES_DIR="/etc/apache2/sites-enabled" + ln -sfT "$ZABBIX_ETC_DIR/apache_envvars" "/etc/apache2/envvars" + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf" diff --git a/Dockerfiles/web-apache-pgsql/README.md b/Dockerfiles/web-apache-pgsql/README.md index f53bd92fe..202990870 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix web interface are: Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile index 919b4ff1c..a4a398973 100644 --- a/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION @@ -40,12 +40,12 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ ca-certificates \ locales \ libldap-common \ - php8.1-bcmath \ - php8.1-gd \ - php8.1-ldap \ - php8.1-mbstring \ - php8.1-xml \ - php8.1-pgsql \ + php8.3-bcmath \ + php8.3-gd \ + php8.3-ldap \ + php8.3-mbstring \ + php8.3-xml \ + php8.3-pgsql \ postgresql-client" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ @@ -98,9 +98,9 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.1/ && \ - chgrp -R 0 /etc/apache2/ /etc/php/8.1/ && \ - chmod -R g=u /etc/apache2/ /etc/php/8.1/ && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php/8.3/ && \ + chgrp -R 0 /etc/apache2/ /etc/php/8.3/ && \ + chmod -R g=u /etc/apache2/ /etc/php/8.3/ && \ apt-get -y autoremove && \ apt-get -y clean diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.1/apache2/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/apache2/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.1/apache2/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/php/8.3/apache2/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars new file mode 100644 index 000000000..54a63c8c9 --- /dev/null +++ b/Dockerfiles/web-apache-pgsql/ubuntu/conf/etc/zabbix/apache_envvars @@ -0,0 +1,4 @@ +export APACHE_RUN_USER=zabbix +export APACHE_RUN_GROUP=zabbix +export APACHE_PID_FILE=/tmp/apache2.pid +export APACHE_RUN_DIR=/tmp diff --git a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh index 7b471a408..3438e064c 100755 --- a/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -122,6 +122,8 @@ check_db_connect() { prepare_web_server() { APACHE_SITES_DIR="/etc/apache2/sites-enabled" + ln -sfT "$ZABBIX_ETC_DIR/apache_envvars" "/etc/apache2/envvars" + echo "** Adding Zabbix virtual host (HTTP)" if [ -f "$ZABBIX_ETC_DIR/apache.conf" ]; then ln -sfT "$ZABBIX_ETC_DIR/apache.conf" "$APACHE_SITES_DIR/zabbix.conf" diff --git a/Dockerfiles/web-nginx-mysql/README.md b/Dockerfiles/web-nginx-mysql/README.md index 795560c51..7e72a6839 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix web interface are: Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile index f90b5a798..a794a3dca 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION @@ -40,32 +40,14 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ nginx \ locales \ libldap-common \ - php8.1-bcmath \ - php8.1-fpm \ - php8.1-gd \ - php8.1-ldap \ - php8.1-mbstring \ - php8.1-mysql \ - php8.1-xml \ + php8.3-bcmath \ + php8.3-fpm \ + php8.3-gd \ + php8.3-ldap \ + php8.3-mbstring \ + php8.3-mysql \ + php8.3-xml \ supervisor" && \ - INSTALL_TEMP_PKGS="gpg \ - ca-certificates \ - dirmngr \ - curl \ - gpg-agent" && \ - apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - --no-install-recommends install \ - ${INSTALL_TEMP_PKGS} && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \ - curl --tlsv1.2 -sSf -L https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \ - gpg --dry-run --quiet --import --import-options import-show /etc/apt/trusted.gpg.d/nginx.gpg && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb https://nginx.org/packages/ubuntu $DISTRIB_CODENAME nginx" > /etc/apt/sources.list.d/nginx.list && \ - echo "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" \ - > /etc/apt/preferences.d/99nginx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ @@ -90,8 +72,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ - rm -f /etc/php/8.1/fpm/pool.d/www.conf && \ - rm -f /etc/php/8.1/fpm/php-fpm.conf.dpkg-dist && \ + rm -f /etc/php/8.3/fpm/pool.d/www.conf && \ + rm -f /etc/php/8.3/fpm/php-fpm.conf.dpkg-dist && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ @@ -111,17 +93,12 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ - chgrp -R 0 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ - chmod -R g=u /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ + chgrp -R 0 /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ + chmod -R g=u /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - purge \ - gpg \ - dirmngr \ - gpg-agent && \ apt-get -y autoremove && \ apt-get -y clean diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf index 7c96929b0..92a6ce6d7 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/nginx/nginx.conf @@ -49,7 +49,7 @@ http { output_buffers 128 512k; postpone_output 1460; - aio on; + #aio on; directio 512; sendfile on; diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf similarity index 65% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf index 4713c9c5b..14deee27a 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.1/fpm/pool.d/*.conf +include=/etc/php/8.3/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 84cc03a38..69a91c495 100644 --- a/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -15,8 +15,8 @@ redirect_stderr=true stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 -[program:php-fpm8.1] -command = /usr/sbin/%(program_name)s -F -y /etc/php/8.1/fpm/php-fpm.conf +[program:php-fpm8.3] +command = /usr/sbin/%(program_name)s -F -y /etc/php/8.3/fpm/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh index d30da6262..e5e682648 100755 --- a/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -163,7 +163,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php/8.1/fpm/pool.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php/8.3/fpm/pool.d/zabbix.conf" export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} diff --git a/Dockerfiles/web-nginx-pgsql/README.md b/Dockerfiles/web-nginx-pgsql/README.md index 9344a8285..536333fe4 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.19, Ubuntu 22.04 (jammy), CentOS Stream 9 and Oracle Linux 9 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.19, Ubuntu 24.04 (noble), CentOS Stream 9 and Oracle Linux 9 images. The available versions of Zabbix web interface are: Zabbix web interface 5.0 (tags: alpine-5.0-latest, ubuntu-5.0-latest, ol-5.0-latest) Zabbix web interface 5.0.* (tags: alpine-5.0.*, ubuntu-5.0.*, ol-5.0.*) diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile index 2c460b273..754680b39 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION @@ -39,33 +39,15 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ nginx \ locales \ libldap-common \ - php8.1-bcmath \ - php8.1-fpm \ - php8.1-gd \ - php8.1-ldap \ - php8.1-mbstring \ - php8.1-xml \ - php8.1-pgsql \ + php8.3-bcmath \ + php8.3-fpm \ + php8.3-gd \ + php8.3-ldap \ + php8.3-mbstring \ + php8.3-xml \ + php8.3-pgsql \ postgresql-client \ supervisor" && \ - INSTALL_TEMP_PKGS="gpg \ - ca-certificates \ - dirmngr \ - curl \ - gpg-agent" && \ - apt-get -y update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y \ - --no-install-recommends install \ - ${INSTALL_TEMP_PKGS} && \ - GNUPGHOME="$(mktemp -d)"; export GNUPGHOME && \ - curl --tlsv1.2 -sSf -L https://nginx.org/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx.gpg && \ - gpg --dry-run --quiet --import --import-options import-show /etc/apt/trusted.gpg.d/nginx.gpg && \ - DISTRIB_CODENAME=$(/bin/bash -c 'source /etc/lsb-release && echo $DISTRIB_CODENAME') && \ - echo "deb https://nginx.org/packages/ubuntu $DISTRIB_CODENAME nginx" > /etc/apt/sources.list.d/nginx.list && \ - echo "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" \ - > /etc/apt/preferences.d/99nginx && \ - gpgconf --kill all && \ - rm -rf "$GNUPGHOME" && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y \ -o Dpkg::Options::="--force-confdef" \ @@ -90,8 +72,8 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ mkdir -p /var/lib/php/session && \ rm -f /etc/nginx/conf.d/*.conf && \ rm -rf /var/cache/nginx/ && \ - rm -f /etc/php/8.1/fpm/pool.d/www.conf && \ - rm -f /etc/php/8.1/fpm/php-fpm.conf.dpkg-dist && \ + rm -f /etc/php/8.3/fpm/pool.d/www.conf && \ + rm -f /etc/php/8.3/fpm/php-fpm.conf.dpkg-dist && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ cd /usr/share/zabbix/ && \ @@ -111,9 +93,9 @@ RUN --mount=type=cache,target=/var/lib/apt/,sharing=locked \ chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ chmod -R g=u /etc/zabbix/ /usr/share/zabbix/include/defines.inc.php /usr/share/zabbix/modules/ && \ - chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ - chgrp -R 0 /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ - chmod -R g=u /etc/nginx/ /etc/php/8.1/fpm/php-fpm.conf /etc/php/8.1/fpm/pool.d/ && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ + chgrp -R 0 /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ + chmod -R g=u /etc/nginx/ /etc/php/8.3/fpm/php-fpm.conf /etc/php/8.3/fpm/pool.d/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf index 7c96929b0..92a6ce6d7 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/nginx/nginx.conf @@ -49,7 +49,7 @@ http { output_buffers 128 512k; postpone_output 1460; - aio on; + #aio on; directio 512; sendfile on; diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf similarity index 65% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf index 4713c9c5b..14deee27a 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php/8.1/fpm/pool.d/*.conf +include=/etc/php/8.3/fpm/pool.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.1/fpm/pool.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/php/8.3/fpm/pool.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 84cc03a38..69a91c495 100644 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -15,8 +15,8 @@ redirect_stderr=true stdout_logfile = /dev/stdout stdout_logfile_maxbytes = 0 -[program:php-fpm8.1] -command = /usr/sbin/%(program_name)s -F -y /etc/php/8.1/fpm/php-fpm.conf +[program:php-fpm8.3] +command = /usr/sbin/%(program_name)s -F -y /etc/php/8.3/fpm/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index 429e6576e..eeea0012b 100755 --- a/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -150,7 +150,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php/8.1/fpm/pool.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php/8.3/fpm/pool.d/zabbix.conf" export PHP_FPM_PM=${PHP_FPM_PM:-"dynamic"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} diff --git a/Dockerfiles/web-service/README.md b/Dockerfiles/web-service/README.md index 8840b6ff6..c421d4d24 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.19, Ubuntu 22.04 (jammy) and Oracle Linux 9 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.19, Ubuntu 24.04 (noble) and Oracle Linux 9 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 bbee80277..398ed3dde 100644 --- a/Dockerfiles/web-service/ubuntu/Dockerfile +++ b/Dockerfiles/web-service/ubuntu/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:ubuntu-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} AS builder -FROM ubuntu:jammy +FROM ubuntu:noble ARG MAJOR_VERSION ARG ZBX_VERSION