From deac4f89d1364ef07a2c844970ad359b0ba964ad Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Mon, 2 Jun 2025 18:18:19 +0900 Subject: [PATCH] Updated Alpine image to 3.22 version --- .../alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 4 ++-- Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh | 2 +- .../alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 4 ++-- Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh | 2 +- .../alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 4 ++-- Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh | 2 +- .../alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf | 4 ++-- Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 447141984..1bdfa61d9 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-apache-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-fpm83] -command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf +[program:php-fpm84] +command = /usr/sbin/%(program_name)s -F -y /etc/php84/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh index 30b961445..a504fa0ec 100755 --- a/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-mysql/alpine/docker-entrypoint.sh @@ -33,7 +33,7 @@ APACHE_SITES_DIR="/etc/apache2/conf.d" # Directory with SSL certificate files for Apache APACHE_SSL_CONFIG_DIR="/etc/ssl/apache2" # PHP-FPM configuration file -PHP_CONFIG_FILE="/etc/php83/php-fpm.d/zabbix.conf" +PHP_CONFIG_FILE="/etc/php84/php-fpm.d/zabbix.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 447141984..1bdfa61d9 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/Dockerfiles/web-apache-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-fpm83] -command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf +[program:php-fpm84] +command = /usr/sbin/%(program_name)s -F -y /etc/php84/php-fpm.conf auto_start = true autorestart = true diff --git a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh index 025d2b264..5b17be021 100755 --- a/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -33,7 +33,7 @@ APACHE_SITES_DIR="/etc/apache2/conf.d" # Directory with SSL certificate files for Apache APACHE_SSL_CONFIG_DIR="/etc/ssl/apache2" # PHP-FPM configuration file -PHP_CONFIG_FILE="/etc/php83/php-fpm.d/zabbix.conf" +PHP_CONFIG_FILE="/etc/php84/php-fpm.d/zabbix.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' 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 4bda8b856..03cc483fd 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-fpm83] -command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf +[program:php-fpm84] +command = /usr/sbin/%(program_name)s -F -y /etc/php84/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 530f5a314..68bc6ff38 100755 --- a/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -30,7 +30,7 @@ NGINX_CONFD_DIR="/etc/nginx/http.d" # Directory with SSL certificate files for Nginx NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx" # PHP-FPM configuration file -PHP_CONFIG_FILE="/etc/php83/php-fpm.d/zabbix.conf" +PHP_CONFIG_FILE="/etc/php84/php-fpm.d/zabbix.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix' 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 4bda8b856..03cc483fd 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-fpm83] -command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf +[program:php-fpm84] +command = /usr/sbin/%(program_name)s -F -y /etc/php84/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 957fc4ac9..2d2f2a594 100755 --- a/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -30,7 +30,7 @@ NGINX_CONFD_DIR="/etc/nginx/http.d" # Directory with SSL certificate files for Nginx NGINX_SSL_CONFIG_DIR="/etc/ssl/nginx" # PHP-FPM configuration file -PHP_CONFIG_FILE="/etc/php83/php-fpm.d/zabbix.conf" +PHP_CONFIG_FILE="/etc/php84/php-fpm.d/zabbix.conf" # usage: file_env VAR [DEFAULT] # as example: file_env 'MYSQL_PASSWORD' 'zabbix'