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

Merge pull request #301 from zabbix/master

Browse Source 
Fixed php-fpm7 on Alpine images
This commit is contained in:
Alexey Pustovalov
2018-05-11 23:22:13 +03:00
committed by GitHub
parent 5cec9cca9b 278be78a91
commit b2c3ed6705
41 changed files with 102 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -811,6 +811,8 @@ prepare_zbx_web_config() {
PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini"
elif [ -f "/etc/php7/conf.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php7/conf.d/99-zabbix.ini"
fi
if [ -n "$PHP_CONFIG_FILE" ]; then