Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Updated PHP to 8.5 on Alpine

Browse source
This commit is contained in:
Alexey Pustovalov 2026-04-14 11:51:43 +09:00
parent e2e7a21002
commit 93b20c2b80
12 changed files with 93 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
Dockerfiles/web-apache-mysql/alpine/Dockerfile
View file

@ -33,12 +33,12 @@ ENV TERM=xterm \
ENV DB_ENGINE=mariadb \
APACHE_BIN=/usr/sbin/httpd \
PHP_FPM_BIN=/usr/sbin/php-fpm84 \
PHP_FPM_BIN=/usr/sbin/php-fpm85 \
APACHE_RUN_DIR=/tmp/apache2 \
HTTPD_CONF_FILE=/etc/apache2/httpd.conf \
APACHE_SITES_DIR=/etc/apache2/conf.d \
PHP_FPM_CONFIG=/etc/php84/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php84/php-fpm.d/zabbix.conf
PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix web-interface based on Apache2 web server with MySQL database support" \
@ -65,23 +65,23 @@ RUN set -eux && \
mariadb-connector-c \
apache2 \
apache2-proxy \
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" && \
php85-bcmath \
php85-ctype \
php85-curl \
php85-fpm \
php85-gd \
php85-gettext \
php85-json \
php85-ldap \
php85-mbstring \
php85-mysqli \
php85-session \
php85-simplexml \
php85-sockets \
php85-fileinfo \
php85-xmlreader \
php85-xmlwriter \
php85-openssl" && \
apk add \
--no-cache \
--clean-protected \
@ -117,7 +117,7 @@ RUN set -eux && \
/etc/apache2/conf.d/proxy.conf \
/etc/apache2/conf.d/languages.conf \
/etc/apache2/conf.d/userdir.conf \
/etc/php84/php-fpm.d/www.conf \
/etc/php85/php-fpm.d/www.conf \
/var/run/apache2/ && \
ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \
ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \
@ -127,8 +127,8 @@ RUN set -eux && \
${ZABBIX_WWW_ROOT}/modules/ \
${ZABBIX_USER_HOME_DIR} \
/etc/apache2/ \
/etc/php84/php-fpm.d/ \
/etc/php84/php-fpm.conf \
/etc/php85/php-fpm.d/ \
/etc/php85/php-fpm.conf \
/var/lib/php/session/" && \
chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \
chmod -R g=u ${FIX_PERM_LIST}

2
Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.conf → Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.conf
View file

@ -1,4 +1,4 @@
include=/etc/php84/php-fpm.d/*.conf
include=/etc/php85/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-apache-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf → Dockerfiles/web-apache-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf
View file

40
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View file

@ -59,23 +59,23 @@ RUN set -eux && \
jq \
apache2 \
apache2-proxy \
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 \
php85-bcmath \
php85-ctype \
php85-curl \
php85-fpm \
php85-gd \
php85-gettext \
php85-json \
php85-ldap \
php85-pgsql \
php85-mbstring \
php85-session \
php85-simplexml \
php85-sockets \
php85-fileinfo \
php85-xmlreader \
php85-xmlwriter \
php85-openssl \
postgresql17-client" && \
apk add \
--no-cache \
@ -112,7 +112,7 @@ RUN set -eux && \
/etc/apache2/conf.d/proxy.conf \
/etc/apache2/conf.d/languages.conf \
/etc/apache2/conf.d/userdir.conf \
/etc/php84/php-fpm.d/www.conf \
/etc/php85/php-fpm.d/www.conf \
/var/run/apache2/ && \
ln -sf "${ZABBIX_CONF_DIR}/web/zabbix.conf.php" "${ZABBIX_WWW_ROOT}/conf/zabbix.conf.php" && \
ln -sf "${ZABBIX_CONF_DIR}/web/maintenance.inc.php" "${ZABBIX_WWW_ROOT}/conf/maintenance.inc.php" && \
@ -122,8 +122,8 @@ RUN set -eux && \
${ZABBIX_WWW_ROOT}/modules/ \
${ZABBIX_USER_HOME_DIR} \
/etc/apache2/ \
/etc/php84/php-fpm.d/ \
/etc/php84/php-fpm.conf \
/etc/php85/php-fpm.d/ \
/etc/php85/php-fpm.conf \
/var/lib/php/session/" && \
chown --quiet -R zabbix:0 ${FIX_PERM_LIST} && \
chmod -R g=u ${FIX_PERM_LIST}

2
Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.conf → Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.conf
View file

@ -1,4 +1,4 @@
include=/etc/php84/php-fpm.d/*.conf
include=/etc/php85/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-apache-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf → Dockerfiles/web-apache-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf
View file

46
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View file

@ -33,10 +33,10 @@ ENV TERM=xterm \
ENV DB_ENGINE=mariadb \
NGINX_BIN=/usr/sbin/nginx \
PHP_FPM_BIN=/usr/sbin/php-fpm84 \
PHP_FPM_BIN=/usr/sbin/php-fpm85 \
NGINX_CONFD_DIR=/etc/nginx/http.d \
PHP_FPM_CONFIG=/etc/php84/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php84/php-fpm.d/zabbix.conf
PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with MySQL database support" \
@ -62,23 +62,23 @@ RUN set -eux && \
mariadb-client \
mariadb-connector-c \
nginx \
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" && \
php85-bcmath \
php85-ctype \
php85-curl \
php85-fpm \
php85-gd \
php85-gettext \
php85-json \
php85-ldap \
php85-mbstring \
php85-mysqli \
php85-session \
php85-simplexml \
php85-sockets \
php85-fileinfo \
php85-xmlreader \
php85-xmlwriter \
php85-openssl" && \
apk add \
--no-cache \
--clean-protected \
@ -102,7 +102,7 @@ RUN set -eux && \
${ZABBIX_USER_HOME_DIR}/enc \
${ZABBIX_USER_HOME_DIR}/enc_internal \
/var/lib/php/session && \
rm -rf /etc/php84/php-fpm.d/www.conf \
rm -rf /etc/php85/php-fpm.d/www.conf \
/etc/nginx/http.d/*.conf && \
ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log && \
@ -113,8 +113,8 @@ RUN set -eux && \
${ZABBIX_WWW_ROOT}/include/defines.inc.php \
${ZABBIX_WWW_ROOT}/modules/ \
/etc/nginx/ \
/etc/php84/php-fpm.d/ \
/etc/php84/php-fpm.conf \
/etc/php85/php-fpm.d/ \
/etc/php85/php-fpm.conf \
${ZABBIX_USER_HOME_DIR}/ \
/var/lib/php/session/ \
/var/lib/nginx/" && \

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.conf
View file

@ -1,4 +1,4 @@
include=/etc/php84/php-fpm.d/*.conf
include=/etc/php85/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf
View file

46
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View file

@ -33,10 +33,10 @@ ENV TERM=xterm \
ENV DB_ENGINE=mariadb \
NGINX_BIN=/usr/sbin/nginx \
PHP_FPM_BIN=/usr/sbin/php-fpm84 \
PHP_FPM_BIN=/usr/sbin/php-fpm85 \
NGINX_CONFD_DIR=/etc/nginx/http.d \
PHP_FPM_CONFIG=/etc/php84/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php84/php-fpm.d/zabbix.conf
PHP_FPM_CONFIG=/etc/php85/php-fpm.conf \
PHP_ZBX_CONFIG_FILE=/etc/php85/php-fpm.d/zabbix.conf
LABEL org.opencontainers.image.authors="Alexey Pustovalov <alexey.pustovalov@zabbix.com>" \
org.opencontainers.image.description="Zabbix web-interface based on Nginx web server with PostgreSQL database support" \
@ -60,23 +60,23 @@ RUN set -eux && \
curl \
jq \
nginx \
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 \
php85-bcmath \
php85-ctype \
php85-curl \
php85-fpm \
php85-gd \
php85-gettext \
php85-json \
php85-ldap \
php85-mbstring \
php85-pgsql \
php85-session \
php85-simplexml \
php85-sockets \
php85-fileinfo \
php85-xmlreader \
php85-xmlwriter \
php85-openssl \
postgresql17-client" && \
apk add \
--no-cache \
@ -101,7 +101,7 @@ RUN set -eux && \
${ZABBIX_USER_HOME_DIR}/enc \
${ZABBIX_USER_HOME_DIR}/enc_internal \
/var/lib/php/session && \
rm -rf /etc/php84/php-fpm.d/www.conf \
rm -rf /etc/php85/php-fpm.d/www.conf \
/etc/nginx/http.d/*.conf && \
ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.log && \
@ -112,8 +112,8 @@ RUN set -eux && \
${ZABBIX_WWW_ROOT}/include/defines.inc.php \
${ZABBIX_WWW_ROOT}/modules/ \
/etc/nginx/ \
/etc/php84/php-fpm.d/ \
/etc/php84/php-fpm.conf \
/etc/php85/php-fpm.d/ \
/etc/php85/php-fpm.conf \
${ZABBIX_USER_HOME_DIR}/ \
/var/lib/php/session/ \
/var/lib/nginx/" && \

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.conf
View file

@ -1,4 +1,4 @@
include=/etc/php84/php-fpm.d/*.conf
include=/etc/php85/php-fpm.d/*.conf
[global]

0
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php84/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php85/php-fpm.d/zabbix.conf
View file