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

Merge pull request #302 from zabbix/master

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

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