diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 89bdcfd9c..fc4f70dc5 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -35,22 +35,22 @@ RUN set -eux && \ mariadb-client \ mariadb-connector-c \ nginx \ - php81-bcmath \ - php81-ctype \ - php81-fpm \ - php81-gd \ - php81-gettext \ - php81-json \ - php81-ldap \ - php81-mbstring \ - php81-mysqli \ - php81-session \ - php81-simplexml \ - php81-sockets \ - php81-fileinfo \ - php81-xmlreader \ - php81-xmlwriter \ - php81-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 \ @@ -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/php81/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/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/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/php81/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/php81/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf index 94269c92e..2e2f3a51d 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php81/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/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/php81/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 a55db2ea4..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-fpm81] -command = /usr/sbin/%(program_name)s -F -y /etc/php81/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 67df2cb59..8cf91a435 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -161,7 +161,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php81/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/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 80c1d217a..b5fe39981 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -33,22 +33,22 @@ RUN set -eux && \ INSTALL_PKGS="bash \ curl \ nginx \ - php81-bcmath \ - php81-ctype \ - php81-fpm \ - php81-gd \ - php81-gettext \ - php81-json \ - php81-ldap \ - php81-mbstring \ - php81-pgsql \ - php81-session \ - php81-simplexml \ - php81-sockets \ - php81-fileinfo \ - php81-xmlreader \ - php81-xmlwriter \ - php81-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 \ @@ -77,7 +77,7 @@ RUN set -eux && \ mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php81/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 && \ @@ -92,9 +92,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/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ - chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/php-fpm.conf && \ - chmod -R g=u /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/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/php81/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/php81/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf index 94269c92e..2e2f3a51d 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php81/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/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/php81/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 a55db2ea4..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-fpm81] -command = /usr/sbin/%(program_name)s -F -y /etc/php81/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 a190878fe..34be4bc91 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -148,7 +148,7 @@ prepare_web_server() { prepare_zbx_web_config() { echo "** Preparing Zabbix frontend configuration file" - PHP_CONFIG_FILE="/etc/php81/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"}