extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-08-10 08:57:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated PHP to 8.3 on Alpine

Browse Source
This commit is contained in:
Alexey Pustovalov
2024-01-19 13:37:11 +09:00
parent bb5de25caa
commit fbb0f0fad9
10 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Dockerfiles/web-nginx-mysql/alpine/Dockerfile
View File

@ -35,22 +35,22 @@ RUN set -eux && \
mariadb-client \ mariadb-client \
mariadb-connector-c \ mariadb-connector-c \
nginx \ nginx \
php81-bcmath \ php83-bcmath \
php81-ctype \ php83-ctype \
php81-fpm \ php83-fpm \
php81-gd \ php83-gd \
php81-gettext \ php83-gettext \
php81-json \ php83-json \
php81-ldap \ php83-ldap \
php81-mbstring \ php83-mbstring \
php81-mysqli \ php83-mysqli \
php81-session \ php83-session \
php81-simplexml \ php83-simplexml \
php81-sockets \ php83-sockets \
php81-fileinfo \ php83-fileinfo \
php81-xmlreader \ php83-xmlreader \
php81-xmlwriter \ php83-xmlwriter \
php81-openssl \ php83-openssl \
supervisor" && \ supervisor" && \
apk add \ apk add \
--no-cache \ --no-cache \
@ -78,7 +78,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web && \
mkdir -p /etc/zabbix/web/certs && \ mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \ 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 && \ rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.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/ && \ 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/ && \ 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/ && \ 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 && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/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/php81/php-fpm.d/ /etc/php81/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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \
chgrp -R 0 /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/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \

2
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.conf
View File

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

0
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm81] [program:php-fpm83]
command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf
auto_start = true auto_start = true
autorestart = true autorestart = true

2
Dockerfiles/web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -161,7 +161,7 @@ prepare_web_server() {
prepare_zbx_web_config() { prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" 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=${PHP_FPM_PM:-"dynamic"}
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}

40
Dockerfiles/web-nginx-pgsql/alpine/Dockerfile
View File

@ -33,22 +33,22 @@ RUN set -eux && \
INSTALL_PKGS="bash \ INSTALL_PKGS="bash \
curl \ curl \
nginx \ nginx \
php81-bcmath \ php83-bcmath \
php81-ctype \ php83-ctype \
php81-fpm \ php83-fpm \
php81-gd \ php83-gd \
php81-gettext \ php83-gettext \
php81-json \ php83-json \
php81-ldap \ php83-ldap \
php81-mbstring \ php83-mbstring \
php81-pgsql \ php83-pgsql \
php81-session \ php83-session \
php81-simplexml \ php83-simplexml \
php81-sockets \ php83-sockets \
php81-fileinfo \ php83-fileinfo \
php81-xmlreader \ php83-xmlreader \
php81-xmlwriter \ php83-xmlwriter \
php81-openssl \ php83-openssl \
postgresql-client \ postgresql-client \
supervisor" && \ supervisor" && \
apk add \ apk add \
@ -77,7 +77,7 @@ RUN set -eux && \
mkdir -p /etc/zabbix/web && \ mkdir -p /etc/zabbix/web && \
mkdir -p /etc/zabbix/web/certs && \ mkdir -p /etc/zabbix/web/certs && \
mkdir -p /var/lib/php/session && \ 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 && \ rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/stdout /var/log/nginx/access.log && \ ln -sf /dev/stdout /var/log/nginx/access.log && \
ln -sf /dev/stderr /var/log/nginx/error.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/ && \ 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/ && \ 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/ && \ 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 && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php83/php-fpm.d/ /etc/php83/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php81/php-fpm.d/ /etc/php81/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/php81/php-fpm.d/ /etc/php81/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/ && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \
chgrp -R 0 /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/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \

2
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.conf
View File

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

0
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php81/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php83/php-fpm.d/zabbix.conf
View File

4
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf
View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm81] [program:php-fpm83]
command = /usr/sbin/%(program_name)s -F -y /etc/php81/php-fpm.conf command = /usr/sbin/%(program_name)s -F -y /etc/php83/php-fpm.conf
auto_start = true auto_start = true
autorestart = true autorestart = true

2
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -148,7 +148,7 @@ prepare_web_server() {
prepare_zbx_web_config() { prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file" 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=${PHP_FPM_PM:-"dynamic"}
export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"} export PHP_FPM_PM_MAX_CHILDREN=${PHP_FPM_PM_MAX_CHILDREN:-"50"}