extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-11-29 11:13:08 +01: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
commit b2c3ed6705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 102 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/alpine/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

2
agent/centos/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

2
agent/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

2
java-gateway/alpine/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

2
java-gateway/centos/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

2
java-gateway/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

2
proxy-mysql/alpine/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

2
proxy-mysql/centos/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

2
proxy-mysql/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

2
proxy-sqlite3/alpine/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

2
proxy-sqlite3/centos/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

2
proxy-sqlite3/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

2
server-mysql/alpine/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

2
server-mysql/centos/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

2
server-mysql/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

2
server-pgsql/alpine/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

2
server-pgsql/centos/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

2
server-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

2
web-apache-mysql/alpine/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

2
web-apache-mysql/centos/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

2
web-apache-mysql/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

2
web-apache-pgsql/alpine/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

2
web-apache-pgsql/centos/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

2
web-apache-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

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

@ -36,16 +36,19 @@ RUN addgroup zabbix && \
mariadb-client \
mariadb-client-libs \
nginx \
php5-bcmath \
php5-ctype \
php5-fpm \
php5-gd \
php5-gettext \
php5-json \
php5-ldap \
php5-mysqli \
php5-sockets \
php5-xmlreader \
php7-bcmath \
php7-ctype \
php7-fpm \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-mbstring \
php7-mysqli \
php7-session \
php7-sockets \
php7-xmlreader \
php7-xmlwriter \
supervisor \
ttf-dejavu && \
rm -rf /var/cache/apk/*
@ -93,8 +96,8 @@ COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
COPY ["conf/etc/php5/php-fpm.conf", "/etc/php5/"]
COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"]
COPY ["conf/etc/php7/php-fpm.conf", "/etc/php7/"]
COPY ["conf/etc/php7/conf.d/99-zabbix.ini", "/etc/php7/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]

2
web-nginx-mysql/alpine/conf/etc/php5/conf.d/99-zabbix.ini → web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini
View File

@ -5,4 +5,4 @@ upload_max_filesize=2M
max_input_time=300
always_populate_raw_post_data=-1
; date.timezone=Europe/Riga
; session.save_path=/var/lib/php5
; session.save_path=/var/lib/php7

0
web-nginx-mysql/alpine/conf/etc/php5/php-fpm.conf → web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf
View File

4
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-fpm]
command = /usr/bin/%(program_name)s -F -c /etc/php5/%(program_name)s.conf
[program:php-fpm7]
command = /usr/sbin/%(program_name)s -F -c /etc/php7/php-fpm.conf
auto_start = true
autorestart = true

2
web-nginx-mysql/alpine/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

2
web-nginx-mysql/centos/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

2
web-nginx-mysql/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

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

@ -34,16 +34,19 @@ RUN addgroup zabbix && \
apk add ${APK_FLAGS_PERSISTANT} \
bash \
nginx \
php5-bcmath \
php5-ctype \
php5-fpm \
php5-gd \
php5-gettext \
php5-json \
php5-ldap \
php5-pgsql \
php5-sockets \
php5-xmlreader \
php7-bcmath \
php7-ctype \
php7-fpm \
php7-gd \
php7-gettext \
php7-json \
php7-ldap \
php7-mbstring \
php7-pgsql \
php7-session \
php7-sockets \
php7-xmlreader \
php7-xmlwriter \
postgresql-client \
supervisor \
ttf-dejavu && \
@ -92,8 +95,8 @@ COPY ["conf/etc/zabbix/nginx.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/nginx_ssl.conf", "/etc/zabbix/"]
COPY ["conf/etc/zabbix/web/zabbix.conf.php", "/etc/zabbix/web/"]
COPY ["conf/etc/nginx/nginx.conf", "/etc/nginx/"]
COPY ["conf/etc/php5/php-fpm.conf", "/etc/php5/"]
COPY ["conf/etc/php5/conf.d/99-zabbix.ini", "/etc/php5/conf.d/"]
COPY ["conf/etc/php7/php-fpm.conf", "/etc/php7/"]
COPY ["conf/etc/php7/conf.d/99-zabbix.ini", "/etc/php7/conf.d/"]
COPY ["docker-entrypoint.sh", "/usr/bin/"]
ENTRYPOINT ["docker-entrypoint.sh"]

2
web-nginx-pgsql/alpine/conf/etc/php5/conf.d/99-zabbix.ini → web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini
View File

@ -5,4 +5,4 @@ upload_max_filesize=2M
max_input_time=300
always_populate_raw_post_data=-1
; date.timezone=Europe/Riga
; session.save_path=/var/lib/php5
; session.save_path=/var/lib/php7

0
web-nginx-pgsql/alpine/conf/etc/php5/php-fpm.conf → web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf
View File

2
web-nginx-pgsql/alpine/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

2
web-nginx-pgsql/centos/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

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

2
zabbix-appliance/alpine/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

2
zabbix-appliance/centos/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

2
zabbix-appliance/rhel/docker-entrypoint.sh
View File

@ -823,6 +823,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

2
zabbix-appliance/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