Fixed php-fpm7 on Alpine images

This commit is contained in:
root 2018-05-11 13:00:31 -07:00
parent c3e713a323
commit 278be78a91
41 changed files with 102 additions and 28 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -15,8 +15,8 @@ redirect_stderr=true
stdout_logfile = /dev/stdout stdout_logfile = /dev/stdout
stdout_logfile_maxbytes = 0 stdout_logfile_maxbytes = 0
[program:php-fpm] [program:php-fpm7]
command = /usr/bin/%(program_name)s -F -c /etc/php5/%(program_name)s.conf command = /usr/sbin/%(program_name)s -F -c /etc/php7/php-fpm.conf
auto_start = true auto_start = true
autorestart = true autorestart = true

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -823,6 +823,8 @@ prepare_zbx_web_config() {
PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini" PHP_CONFIG_FILE="/etc/php/7.0/fpm/conf.d/99-zabbix.ini"
elif [ -f "/etc/php.d/99-zabbix.ini" ]; then elif [ -f "/etc/php.d/99-zabbix.ini" ]; then
PHP_CONFIG_FILE="/etc/php.d/99-zabbix.ini" 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 fi
if [ -n "$PHP_CONFIG_FILE" ]; then if [ -n "$PHP_CONFIG_FILE" ]; then

View File

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