diff --git a/Dockerfiles/agent/alpine/Dockerfile b/Dockerfiles/agent/alpine/Dockerfile index 13883ab89..558e47b51 100644 --- a/Dockerfiles/agent/alpine/Dockerfile +++ b/Dockerfiles/agent/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/agent2/alpine/Dockerfile b/Dockerfiles/agent2/alpine/Dockerfile index 7f7302961..01a57f525 100644 --- a/Dockerfiles/agent2/alpine/Dockerfile +++ b/Dockerfiles/agent2/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/build-base/alpine/Dockerfile b/Dockerfiles/build-base/alpine/Dockerfile index 6ef59db6e..b62c48f38 100644 --- a/Dockerfiles/build-base/alpine/Dockerfile +++ b/Dockerfiles/build-base/alpine/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.30 diff --git a/Dockerfiles/java-gateway/alpine/Dockerfile b/Dockerfiles/java-gateway/alpine/Dockerfile index ef6af8906..0e5d3e3b7 100644 --- a/Dockerfiles/java-gateway/alpine/Dockerfile +++ b/Dockerfiles/java-gateway/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-mysql/alpine/Dockerfile b/Dockerfiles/proxy-mysql/alpine/Dockerfile index b1361b181..430d5629d 100644 --- a/Dockerfiles/proxy-mysql/alpine/Dockerfile +++ b/Dockerfiles/proxy-mysql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile index 81bda65a3..6bb19e58a 100644 --- a/Dockerfiles/proxy-sqlite3/alpine/Dockerfile +++ b/Dockerfiles/proxy-sqlite3/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-sqlite3:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-mysql/alpine/Dockerfile b/Dockerfiles/server-mysql/alpine/Dockerfile index a69b39175..5d0582f1c 100644 --- a/Dockerfiles/server-mysql/alpine/Dockerfile +++ b/Dockerfiles/server-mysql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/server-pgsql/alpine/Dockerfile b/Dockerfiles/server-pgsql/alpine/Dockerfile index 9103f0ac6..f04da5b90 100644 --- a/Dockerfiles/server-pgsql/alpine/Dockerfile +++ b/Dockerfiles/server-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION diff --git a/Dockerfiles/snmptraps/alpine/Dockerfile b/Dockerfiles/snmptraps/alpine/Dockerfile index a41b7a214..5c0a6570d 100644 --- a/Dockerfiles/snmptraps/alpine/Dockerfile +++ b/Dockerfiles/snmptraps/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION=6.0 ARG ZBX_VERSION=${MAJOR_VERSION}.30 diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index 83eddecaf..d483cf44c 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -36,22 +36,22 @@ RUN set -eux && \ curl \ mariadb-client \ mariadb-connector-c \ - php8-apache2 \ - php8-bcmath \ - php8-ctype \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-mysqli \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl" && \ + php83-apache2 \ + php83-bcmath \ + php83-ctype \ + php83-gd \ + php83-gettext \ + php83-json \ + php83-ldap \ + php83-mbstring \ + php83-mysqli \ + php83-session \ + php83-simplexml \ + php83-sockets \ + php83-fileinfo \ + php83-xmlreader \ + php83-xmlwriter \ + php83-openssl" && \ apk add \ --no-cache \ --clean-protected \ @@ -99,9 +99,9 @@ RUN set -eux && \ 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/php8/ && \ - chgrp -R 0 /etc/apache2/ /etc/php8/ && \ - chmod -R g=u /etc/apache2/ /etc/php8/ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \ + chgrp -R 0 /etc/apache2/ /etc/php83/ && \ + chmod -R g=u /etc/apache2/ /etc/php83/ EXPOSE 8080/TCP 8443/TCP diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-apache-mysql/centos/Dockerfile b/Dockerfiles/web-apache-mysql/centos/Dockerfile index c02383a7f..ead115443 100644 --- a/Dockerfiles/web-apache-mysql/centos/Dockerfile +++ b/Dockerfiles/web-apache-mysql/centos/Dockerfile @@ -51,7 +51,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ supervisor" && \ dnf -y install epel-release && \ dnf -y module enable mysql && \ - dnf -y module enable php:8.0 && \ + dnf -y module enable php:8.2 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index fbd66cace..8689af005 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -34,22 +34,22 @@ RUN set -eux && \ tzdata \ apache2 \ curl \ - php8-apache2 \ - php8-bcmath \ - php8-ctype \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-pgsql \ - php8-mbstring \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php83-apache2 \ + php83-bcmath \ + php83-ctype \ + php83-gd \ + php83-gettext \ + php83-json \ + php83-ldap \ + php83-pgsql \ + php83-mbstring \ + php83-session \ + php83-simplexml \ + php83-sockets \ + php83-fileinfo \ + php83-xmlreader \ + php83-xmlwriter \ + php83-openssl \ postgresql-client" && \ apk add \ --no-cache \ @@ -98,9 +98,9 @@ RUN set -eux && \ 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/php8/ && \ - chgrp -R 0 /etc/apache2/ /etc/php8/ && \ - chmod -R g=u /etc/apache2/ /etc/php8/ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/ && \ + chgrp -R 0 /etc/apache2/ /etc/php83/ && \ + chmod -R g=u /etc/apache2/ /etc/php83/ EXPOSE 8080/TCP 8443/TCP diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/conf.d/99-zabbix.ini similarity index 100% rename from Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/conf.d/99-zabbix.ini diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 5d19e33a7..550473f66 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -36,22 +36,22 @@ RUN set -eux && \ mariadb-client \ mariadb-connector-c \ nginx \ - php8-bcmath \ - php8-ctype \ - php8-fpm \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-mysqli \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php83-bcmath \ + php83-ctype \ + php83-fpm \ + php83-gd \ + php83-gettext \ + php83-json \ + php83-ldap \ + php83-mbstring \ + php83-mysqli \ + php83-session \ + php83-simplexml \ + php83-sockets \ + php83-fileinfo \ + php83-xmlreader \ + php83-xmlwriter \ + php83-openssl \ supervisor" && \ apk add \ --no-cache \ @@ -79,7 +79,7 @@ RUN set -eux && \ mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php8/php-fpm.d/www.conf && \ + rm -rf /etc/php83/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ @@ -94,9 +94,9 @@ RUN set -eux && \ 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/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf similarity index 66% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf index 7cc89d0f9..2e2f3a51d 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php8/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 84943ea2a..4bda8b856 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/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] -command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf +[program:php-fpm83] +command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh index ef3cf23b0..1c8a85598 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -163,7 +163,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php83/php-fpm.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-mysql/centos/Dockerfile b/Dockerfiles/web-nginx-mysql/centos/Dockerfile index f87c071a2..d1fb3403f 100644 --- a/Dockerfiles/web-nginx-mysql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/centos/Dockerfile @@ -49,7 +49,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ supervisor" && \ dnf -y install epel-release && \ dnf -y module enable mysql && \ - dnf -y module enable php:8.0 nginx:1.22 && \ + dnf -y module enable php:8.2 nginx:1.24 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-nginx-mysql/ol/Dockerfile b/Dockerfiles/web-nginx-mysql/ol/Dockerfile index 9dfc06345..1a7fe78ec 100644 --- a/Dockerfiles/web-nginx-mysql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/ol/Dockerfile @@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ glibc-locale-source \ supervisor" && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:8.0 nginx:1.22 && \ + microdnf -y module enable php:8.2 nginx:1.24 && \ microdnf -y install \ --disablerepo="*" \ --enablerepo="ol8_baseos_latest" \ diff --git a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile index e7551126d..65176f09c 100644 --- a/Dockerfiles/web-nginx-mysql/rhel/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/rhel/Dockerfile @@ -70,7 +70,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ rpm -ivh /tmp/epel-release-latest-8.noarch.rpm && \ rm -rf /tmp/epel-release-latest-8.noarch.rpm && \ microdnf -y module enable mysql && \ - microdnf -y module enable php:8.0 nginx:1.20 && \ + microdnf -y module enable php:8.2 nginx:1.24 && \ microdnf -y install \ --disablerepo "*" \ --enablerepo "ubi-8-baseos-rpms" \ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 38efb3433..cd975daba 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-pgsql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION @@ -34,22 +34,22 @@ RUN set -eux && \ tzdata \ curl \ nginx \ - php8-bcmath \ - php8-ctype \ - php8-fpm \ - php8-gd \ - php8-gettext \ - php8-json \ - php8-ldap \ - php8-mbstring \ - php8-pgsql \ - php8-session \ - php8-simplexml \ - php8-sockets \ - php8-fileinfo \ - php8-xmlreader \ - php8-xmlwriter \ - php8-openssl \ + php83-bcmath \ + php83-ctype \ + php83-fpm \ + php83-gd \ + php83-gettext \ + php83-json \ + php83-ldap \ + php83-mbstring \ + php83-pgsql \ + php83-session \ + php83-simplexml \ + php83-sockets \ + php83-fileinfo \ + php83-xmlreader \ + php83-xmlwriter \ + php83-openssl \ postgresql-client \ supervisor" && \ apk add \ @@ -78,7 +78,7 @@ RUN set -eux && \ mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php8/php-fpm.d/www.conf && \ + rm -rf /etc/php83/php-fpm.d/www.conf && \ rm -f /etc/nginx/http.d/*.conf && \ ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stderr /var/log/nginx/error.log && \ @@ -93,9 +93,9 @@ RUN set -eux && \ 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/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf similarity index 66% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf index 7cc89d0f9..2e2f3a51d 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php8/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 84943ea2a..4bda8b856 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/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] -command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf +[program:php-fpm83] +command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh index 3f867c5e0..3fae24add 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -150,7 +150,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php8/php-fpm.d/zabbix.conf" + PHP_CONFIG_FILE="/etc/php83/php-fpm.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/centos/Dockerfile b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile index f0183a07a..b4e31c75d 100644 --- a/Dockerfiles/web-nginx-pgsql/centos/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/centos/Dockerfile @@ -48,7 +48,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ postgresql \ supervisor" && \ dnf -y install epel-release && \ - dnf -y module enable php:8.0 nginx:1.22 && \ + dnf -y module enable php:8.2 nginx:1.24 && \ dnf -y install \ --disablerepo "*" \ --enablerepo "${REPOLIST}" \ diff --git a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile index 09a55531e..710ad8d22 100644 --- a/Dockerfiles/web-nginx-pgsql/ol/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/ol/Dockerfile @@ -47,7 +47,7 @@ RUN --mount=type=tmpfs,target=/var/lib/dnf/ \ php-xml \ postgresql \ supervisor" && \ - microdnf -y module enable php:8.0 nginx:1.22 && \ + microdnf -y module enable php:8.2 nginx:1.24 && \ microdnf module enable postgresql:15 && \ microdnf -y install \ --disablerepo="*" \ diff --git a/Dockerfiles/web-service/alpine/Dockerfile b/Dockerfiles/web-service/alpine/Dockerfile index f10310589..fbde980ff 100644 --- a/Dockerfiles/web-service/alpine/Dockerfile +++ b/Dockerfiles/web-service/alpine/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix-build-mysql:alpine-${ZBX_VERSION} FROM ${BUILD_BASE_IMAGE} as builder -FROM alpine:3.16 +FROM alpine:3.19 ARG MAJOR_VERSION ARG ZBX_VERSION