extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-21 23:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using PHP8 in Alpine based images

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-05-11 18:08:04 +03:00
parent a0930b9733
commit de11a16eb0
14 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Dockerfiles/web-apache-mysql/alpine/Dockerfile
View File

@ -35,22 +35,22 @@ RUN set -eux && \
curl \
mariadb-client \
mariadb-connector-c \
php7-apache2 \
php7-bcmath \
php7-ctype \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-mbstring \
php7-mysqli \
php7-session \
php7-simplexml \
php7-sockets \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl" && \
php8-apache2 \
php8-bcmath \
php8-ctype \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-mysqli \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl" && \
apk add \
--no-cache \
--clean-protected \
@ -99,9 +99,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/apache2/ /etc/php7/ && \
chgrp -R 0 /etc/apache2/ /etc/php7/ && \
chmod -R g=u /etc/apache2/ /etc/php7/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/ && \
rm -rf /var/cache/apk/*
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini → Dockerfiles/web-apache-mysql/alpine/conf/etc/php8/conf.d/99-zabbix.ini
View File

38
Dockerfiles/web-apache-pgsql/alpine/Dockerfile
View File

@ -33,22 +33,22 @@ RUN set -eux && \
INSTALL_PKGS="bash \
apache2 \
curl \
php7-apache2 \
php7-bcmath \
php7-ctype \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-pgsql \
php7-mbstring \
php7-session \
php7-simplexml \
php7-sockets \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl \
php8-apache2 \
php8-bcmath \
php8-ctype \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-pgsql \
php8-mbstring \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
postgresql-client" && \
apk add \
--no-cache \
@ -98,9 +98,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/apache2/ /etc/php7/ && \
chgrp -R 0 /etc/apache2/ /etc/php7/ && \
chmod -R g=u /etc/apache2/ /etc/php7/ && \
chown --quiet -R zabbix:root /etc/apache2/ /etc/php8/ && \
chgrp -R 0 /etc/apache2/ /etc/php8/ && \
chmod -R g=u /etc/apache2/ /etc/php8/ && \
rm -rf /var/cache/apk/*
EXPOSE 8080/TCP 8443/TCP

0
Dockerfiles/web-apache-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini → Dockerfiles/web-apache-pgsql/alpine/conf/etc/php8/conf.d/99-zabbix.ini
View File

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

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

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

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

0
Dockerfiles/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-mysql/alpine/conf/etc/php8/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_maxbytes = 0
[program:php-fpm7]
command = /usr/sbin/%(program_name)s -F -y /etc/php7/php-fpm.conf
[program:php-fpm8]
command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf
auto_start = true
autorestart = true

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

@ -143,7 +143,7 @@ prepare_web_server() {
prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file"
PHP_CONFIG_FILE="/etc/php7/php-fpm.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php8/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"}

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

@ -33,22 +33,22 @@ RUN set -eux && \
INSTALL_PKGS="bash \
curl \
nginx \
php7-bcmath \
php7-ctype \
php7-fpm \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-mbstring \
php7-pgsql \
php7-session \
php7-simplexml \
php7-sockets \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl \
php8-bcmath \
php8-ctype \
php8-fpm \
php8-gd \
php8-gettext \
php8-json \
php8-ldap \
php8-mbstring \
php8-pgsql \
php8-session \
php8-simplexml \
php8-sockets \
php8-fileinfo \
php8-xmlreader \
php8-xmlwriter \
php8-openssl \
postgresql-client \
supervisor" && \
apk add \
@ -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/php7/php-fpm.d/www.conf && \
rm -rf /etc/php8/php-fpm.d/www.conf && \
rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
cd /usr/share/zabbix/ && \
@ -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/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \
chown --quiet -R zabbix:root /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chgrp -R 0 /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/php-fpm.conf && \
chmod -R g=u /etc/nginx/ /etc/php8/php-fpm.d/ /etc/php8/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/ && \

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

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

0
Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.d/zabbix.conf → Dockerfiles/web-nginx-pgsql/alpine/conf/etc/php8/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_maxbytes = 0
[program:php-fpm7]
command = /usr/sbin/%(program_name)s -F -y /etc/php7/php-fpm.conf
[program:php-fpm8]
command = /usr/sbin/%(program_name)s -F -y /etc/php8/php-fpm.conf
auto_start = true
autorestart = true

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

@ -142,7 +142,7 @@ prepare_web_server() {
prepare_zbx_web_config() {
echo "** Preparing Zabbix frontend configuration file"
PHP_CONFIG_FILE="/etc/php7/php-fpm.d/zabbix.conf"
PHP_CONFIG_FILE="/etc/php8/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"}