From 77e078b582dcc2f8758869708919d93b32bd5d0d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 May 2025 13:30:03 +0000 Subject: [PATCH] Updated PHP to 8.4 version on Alpine --- .../web-apache-mysql/alpine/Dockerfile | 42 +++++++++---------- .../conf/etc/{php83 => php84}/php-fpm.conf | 2 +- .../conf/etc/php84}/php-fpm.d/zabbix.conf | 0 .../web-apache-pgsql/alpine/Dockerfile | 42 +++++++++---------- .../conf/etc/{php83 => php84}/php-fpm.conf | 2 +- .../conf/etc/php84}/php-fpm.d/zabbix.conf | 0 Dockerfiles/web-nginx-mysql/alpine/Dockerfile | 42 +++++++++---------- .../conf/etc/{php83 => php84}/php-fpm.conf | 2 +- .../{php83 => php84}/php-fpm.d/zabbix.conf | 0 Dockerfiles/web-nginx-pgsql/alpine/Dockerfile | 42 +++++++++---------- .../conf/etc/{php83 => php84}/php-fpm.conf | 2 +- .../{php83 => php84}/php-fpm.d/zabbix.conf | 0 12 files changed, 88 insertions(+), 88 deletions(-) rename Dockerfiles/web-apache-mysql/alpine/conf/etc/{php83 => php84}/php-fpm.conf (71%) rename Dockerfiles/{web-apache-pgsql/alpine/conf/etc/php83 => web-apache-mysql/alpine/conf/etc/php84}/php-fpm.d/zabbix.conf (100%) rename Dockerfiles/web-apache-pgsql/alpine/conf/etc/{php83 => php84}/php-fpm.conf (71%) rename Dockerfiles/{web-apache-mysql/alpine/conf/etc/php83 => web-apache-pgsql/alpine/conf/etc/php84}/php-fpm.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-mysql/alpine/conf/etc/{php83 => php84}/php-fpm.conf (71%) rename Dockerfiles/web-nginx-mysql/alpine/conf/etc/{php83 => php84}/php-fpm.d/zabbix.conf (100%) rename Dockerfiles/web-nginx-pgsql/alpine/conf/etc/{php83 => php84}/php-fpm.conf (71%) rename Dockerfiles/web-nginx-pgsql/alpine/conf/etc/{php83 => php84}/php-fpm.d/zabbix.conf (100%) diff --git a/Dockerfiles/web-apache-mysql/alpine/Dockerfile b/Dockerfiles/web-apache-mysql/alpine/Dockerfile index c1dd05c3c..ffbccce77 100644 --- a/Dockerfiles/web-apache-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-mysql/alpine/Dockerfile @@ -39,23 +39,23 @@ RUN set -eux && \ mariadb-client \ mariadb-connector-c \ apache2-proxy \ - php83-bcmath \ - php83-ctype \ - php83-curl \ - 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 \ + php84-bcmath \ + php84-ctype \ + php84-curl \ + php84-fpm \ + php84-gd \ + php84-gettext \ + php84-json \ + php84-ldap \ + php84-mbstring \ + php84-mysqli \ + php84-session \ + php84-simplexml \ + php84-sockets \ + php84-fileinfo \ + php84-xmlreader \ + php84-xmlwriter \ + php84-openssl \ supervisor" && \ apk add \ --no-cache \ @@ -90,7 +90,7 @@ RUN set -eux && \ rm -f "/etc/apache2/conf.d/languages.conf" && \ rm -f "/etc/apache2/conf.d/userdir.conf" && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php83/php-fpm.d/www.conf && \ + rm -rf /etc/php84/php-fpm.d/www.conf && \ rm -rf "/var/run/apache2/" && \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ @@ -103,9 +103,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chgrp -R 0 ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chmod -R g=u ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ - chgrp -R 0 /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ - chmod -R g=u /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chgrp -R 0 /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chmod -R g=u /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ 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-apache-mysql/alpine/conf/etc/php83/php-fpm.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.conf similarity index 71% rename from Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.conf rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.conf index e23aa2d90..26cb71063 100644 --- a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.conf +++ b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php83/php-fpm.d/*.conf +include=/etc/php84/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile index 593698626..c5b08871e 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-apache-pgsql/alpine/Dockerfile @@ -37,23 +37,23 @@ RUN set -eux && \ tzdata \ curl \ apache2-proxy \ - php83-bcmath \ - php83-ctype \ - php83-curl \ - php83-fpm \ - 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 \ + php84-bcmath \ + php84-ctype \ + php84-curl \ + php84-fpm \ + php84-gd \ + php84-gettext \ + php84-json \ + php84-ldap \ + php84-pgsql \ + php84-mbstring \ + php84-session \ + php84-simplexml \ + php84-sockets \ + php84-fileinfo \ + php84-xmlreader \ + php84-xmlwriter \ + php84-openssl \ postgresql17-client \ supervisor" && \ apk add \ @@ -89,7 +89,7 @@ RUN set -eux && \ rm -f "/etc/apache2/conf.d/languages.conf" && \ rm -f "/etc/apache2/conf.d/userdir.conf" && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php83/php-fpm.d/www.conf && \ + rm -rf /etc/php84/php-fpm.d/www.conf && \ rm -rf "/var/run/apache2/" && \ cd ${ZABBIX_WWW_ROOT}/ && \ rm -f conf/zabbix.conf.php conf/maintenance.inc.php conf/zabbix.conf.php.example && \ @@ -102,9 +102,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chgrp -R 0 ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chmod -R g=u ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ - chown --quiet -R zabbix:root /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ - chgrp -R 0 /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ - chmod -R g=u /etc/apache2/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \ + chown --quiet -R zabbix:root /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chgrp -R 0 /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chmod -R g=u /etc/apache2/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ 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-apache-pgsql/alpine/conf/etc/php83/php-fpm.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.conf similarity index 71% rename from Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/php-fpm.conf rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.conf index e23aa2d90..26cb71063 100644 --- a/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php83/php-fpm.conf +++ b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php83/php-fpm.d/*.conf +include=/etc/php84/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-apache-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf rename to Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile index 1b768b036..4f3d1af49 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-mysql/alpine/Dockerfile @@ -39,23 +39,23 @@ RUN set -eux && \ mariadb-client \ mariadb-connector-c \ nginx \ - php83-bcmath \ - php83-ctype \ - php83-curl \ - 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 \ + php84-bcmath \ + php84-ctype \ + php84-curl \ + php84-fpm \ + php84-gd \ + php84-gettext \ + php84-json \ + php84-ldap \ + php84-mbstring \ + php84-mysqli \ + php84-session \ + php84-simplexml \ + php84-sockets \ + php84-fileinfo \ + php84-xmlreader \ + php84-xmlwriter \ + php84-openssl \ supervisor" && \ apk add \ --no-cache \ @@ -83,7 +83,7 @@ RUN set -eux && \ mkdir -p ${ZABBIX_CONF_DIR}/web && \ mkdir -p ${ZABBIX_CONF_DIR}/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php83/php-fpm.d/www.conf && \ + rm -rf /etc/php84/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 && \ @@ -98,9 +98,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chgrp -R 0 ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chmod -R g=u ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ - 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 /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/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/php83/php-fpm.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.conf similarity index 71% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.conf index e23aa2d90..26cb71063 100644 --- a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf +++ b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php83/php-fpm.d/*.conf +include=/etc/php84/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf diff --git a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile index 8d12ab5cf..661378887 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile +++ b/Dockerfiles/web-nginx-pgsql/alpine/Dockerfile @@ -37,23 +37,23 @@ RUN set -eux && \ tzdata \ curl \ nginx \ - php83-bcmath \ - php83-ctype \ - php83-curl \ - 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 \ + php84-bcmath \ + php84-ctype \ + php84-curl \ + php84-fpm \ + php84-gd \ + php84-gettext \ + php84-json \ + php84-ldap \ + php84-mbstring \ + php84-pgsql \ + php84-session \ + php84-simplexml \ + php84-sockets \ + php84-fileinfo \ + php84-xmlreader \ + php84-xmlwriter \ + php84-openssl \ postgresql17-client \ supervisor" && \ apk add \ @@ -82,7 +82,7 @@ RUN set -eux && \ mkdir -p ${ZABBIX_CONF_DIR}/web && \ mkdir -p ${ZABBIX_CONF_DIR}/web/certs && \ mkdir -p /var/lib/php/session && \ - rm -rf /etc/php83/php-fpm.d/www.conf && \ + rm -rf /etc/php84/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 && \ @@ -97,9 +97,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chgrp -R 0 ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ chmod -R g=u ${ZABBIX_CONF_DIR}/ ${ZABBIX_WWW_ROOT}/include/defines.inc.php ${ZABBIX_WWW_ROOT}/modules/ && \ - 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 /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chgrp -R 0 /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/php-fpm.conf && \ + chmod -R g=u /etc/nginx/ /etc/php84/php-fpm.d/ /etc/php84/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/php83/php-fpm.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.conf similarity index 71% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.conf index e23aa2d90..26cb71063 100644 --- a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf +++ b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.conf @@ -1,4 +1,4 @@ -include=/etc/php83/php-fpm.d/*.conf +include=/etc/php84/php-fpm.d/*.conf [global] diff --git a/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf b/Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf similarity index 100% rename from Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf rename to Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf