extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-16 02:28:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow PHP-FPM under root and add PHP openssl package in Alpine images

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-07-23 11:35:09 -04:00
parent ff23a484ae
commit 7da2e16ff2
6 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web-apache-mysql/alpine/Dockerfile
View File

@ -39,7 +39,8 @@ RUN set -eux && \
php7-sockets \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter && \
php7-xmlwriter \
php7-openssl && \
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
rm -f "/etc/apache2/conf.d/default.conf" && \
rm -f "/etc/apache2/conf.d/ssl.conf" && \

7
web-apache-mysql/centos/docker-entrypoint.sh
View File

@ -223,6 +223,13 @@ prepare_zbx_web_config() {
update_config_var "$PHP_CONFIG_FILE" "php_value[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
if [ "$(id -u)" == '0' ]; then
echo "user = zabbix" >> "$PHP_CONFIG_FILE"
echo "group = zabbix" >> "$PHP_CONFIG_FILE"
echo "listen.owner = nginx" >> "$PHP_CONFIG_FILE"
echo "listen.group = nginx" >> "$PHP_CONFIG_FILE"
fi
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
# Escaping characters in parameter value

1
web-apache-pgsql/alpine/Dockerfile
View File

@ -38,6 +38,7 @@ RUN set -eux && \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl \
postgresql-client && \
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
rm -f "/etc/apache2/conf.d/default.conf" && \

7
web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -225,6 +225,13 @@ prepare_zbx_web_config() {
update_config_var "$PHP_CONFIG_FILE" "php_value[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
if [ "$(id -u)" == '0' ]; then
echo "user = zabbix" >> "$PHP_CONFIG_FILE"
echo "group = zabbix" >> "$PHP_CONFIG_FILE"
echo "listen.owner = nginx" >> "$PHP_CONFIG_FILE"
echo "listen.group = nginx" >> "$PHP_CONFIG_FILE"
fi
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
# Escaping characters in parameter value

1
web-nginx-mysql/alpine/Dockerfile
View File

@ -41,6 +41,7 @@ RUN set -eux && \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl \
supervisor && \
rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \

1
web-nginx-pgsql/alpine/Dockerfile
View File

@ -39,6 +39,7 @@ RUN set -eux && \
php7-fileinfo \
php7-xmlreader \
php7-xmlwriter \
php7-openssl \
postgresql-client \
supervisor && \
rm -rf /etc/php7/php-fpm.d/www.conf && \