mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2025-01-16 02:28:22 +01:00
Allow PHP-FPM under root and add PHP openssl package in Alpine images
This commit is contained in:
parent
ff23a484ae
commit
7da2e16ff2
@ -39,7 +39,8 @@ RUN set -eux && \
|
|||||||
php7-sockets \
|
php7-sockets \
|
||||||
php7-fileinfo \
|
php7-fileinfo \
|
||||||
php7-xmlreader \
|
php7-xmlreader \
|
||||||
php7-xmlwriter && \
|
php7-xmlwriter \
|
||||||
|
php7-openssl && \
|
||||||
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
|
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
|
||||||
rm -f "/etc/apache2/conf.d/default.conf" && \
|
rm -f "/etc/apache2/conf.d/default.conf" && \
|
||||||
rm -f "/etc/apache2/conf.d/ssl.conf" && \
|
rm -f "/etc/apache2/conf.d/ssl.conf" && \
|
||||||
|
@ -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[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
|
||||||
update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
|
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:-"[]"}
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
|
@ -38,6 +38,7 @@ RUN set -eux && \
|
|||||||
php7-fileinfo \
|
php7-fileinfo \
|
||||||
php7-xmlreader \
|
php7-xmlreader \
|
||||||
php7-xmlwriter \
|
php7-xmlwriter \
|
||||||
|
php7-openssl \
|
||||||
postgresql-client && \
|
postgresql-client && \
|
||||||
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
|
apk add --clean-protected --no-cache --no-scripts apache2-ssl && \
|
||||||
rm -f "/etc/apache2/conf.d/default.conf" && \
|
rm -f "/etc/apache2/conf.d/default.conf" && \
|
||||||
|
@ -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[max_input_time]" "${ZBX_MAXINPUTTIME:-"300"}"
|
||||||
update_config_var "$PHP_CONFIG_FILE" "php_value[date.timezone]" "${PHP_TZ}"
|
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:-"[]"}
|
ZBX_HISTORYSTORAGETYPES=${ZBX_HISTORYSTORAGETYPES:-"[]"}
|
||||||
|
|
||||||
# Escaping characters in parameter value
|
# Escaping characters in parameter value
|
||||||
|
@ -41,6 +41,7 @@ RUN set -eux && \
|
|||||||
php7-fileinfo \
|
php7-fileinfo \
|
||||||
php7-xmlreader \
|
php7-xmlreader \
|
||||||
php7-xmlwriter \
|
php7-xmlwriter \
|
||||||
|
php7-openssl \
|
||||||
supervisor && \
|
supervisor && \
|
||||||
rm -rf /etc/php7/php-fpm.d/www.conf && \
|
rm -rf /etc/php7/php-fpm.d/www.conf && \
|
||||||
rm -f /etc/nginx/conf.d/*.conf && \
|
rm -f /etc/nginx/conf.d/*.conf && \
|
||||||
|
@ -39,6 +39,7 @@ RUN set -eux && \
|
|||||||
php7-fileinfo \
|
php7-fileinfo \
|
||||||
php7-xmlreader \
|
php7-xmlreader \
|
||||||
php7-xmlwriter \
|
php7-xmlwriter \
|
||||||
|
php7-openssl \
|
||||||
postgresql-client \
|
postgresql-client \
|
||||||
supervisor && \
|
supervisor && \
|
||||||
rm -rf /etc/php7/php-fpm.d/www.conf && \
|
rm -rf /etc/php7/php-fpm.d/www.conf && \
|
||||||
|
Loading…
Reference in New Issue
Block a user