diff --git a/agent/alpine/docker-entrypoint.sh b/agent/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/agent/alpine/docker-entrypoint.sh +++ b/agent/alpine/docker-entrypoint.sh @@ -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 diff --git a/agent/centos/docker-entrypoint.sh b/agent/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/agent/centos/docker-entrypoint.sh +++ b/agent/centos/docker-entrypoint.sh @@ -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 diff --git a/agent/ubuntu/docker-entrypoint.sh b/agent/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/agent/ubuntu/docker-entrypoint.sh +++ b/agent/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/alpine/docker-entrypoint.sh b/java-gateway/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/java-gateway/alpine/docker-entrypoint.sh +++ b/java-gateway/alpine/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/centos/docker-entrypoint.sh b/java-gateway/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/java-gateway/centos/docker-entrypoint.sh +++ b/java-gateway/centos/docker-entrypoint.sh @@ -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 diff --git a/java-gateway/ubuntu/docker-entrypoint.sh b/java-gateway/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/java-gateway/ubuntu/docker-entrypoint.sh +++ b/java-gateway/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/alpine/docker-entrypoint.sh b/proxy-mysql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-mysql/alpine/docker-entrypoint.sh +++ b/proxy-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/centos/docker-entrypoint.sh b/proxy-mysql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-mysql/centos/docker-entrypoint.sh +++ b/proxy-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-mysql/ubuntu/docker-entrypoint.sh b/proxy-mysql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-mysql/ubuntu/docker-entrypoint.sh +++ b/proxy-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/alpine/docker-entrypoint.sh b/proxy-sqlite3/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-sqlite3/alpine/docker-entrypoint.sh +++ b/proxy-sqlite3/alpine/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/centos/docker-entrypoint.sh b/proxy-sqlite3/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-sqlite3/centos/docker-entrypoint.sh +++ b/proxy-sqlite3/centos/docker-entrypoint.sh @@ -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 diff --git a/proxy-sqlite3/ubuntu/docker-entrypoint.sh b/proxy-sqlite3/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/proxy-sqlite3/ubuntu/docker-entrypoint.sh +++ b/proxy-sqlite3/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/alpine/docker-entrypoint.sh b/server-mysql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-mysql/alpine/docker-entrypoint.sh +++ b/server-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/centos/docker-entrypoint.sh b/server-mysql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-mysql/centos/docker-entrypoint.sh +++ b/server-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-mysql/ubuntu/docker-entrypoint.sh b/server-mysql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-mysql/ubuntu/docker-entrypoint.sh +++ b/server-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/alpine/docker-entrypoint.sh b/server-pgsql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-pgsql/alpine/docker-entrypoint.sh +++ b/server-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/centos/docker-entrypoint.sh b/server-pgsql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-pgsql/centos/docker-entrypoint.sh +++ b/server-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/server-pgsql/ubuntu/docker-entrypoint.sh b/server-pgsql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/server-pgsql/ubuntu/docker-entrypoint.sh +++ b/server-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/alpine/docker-entrypoint.sh b/web-apache-mysql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-mysql/alpine/docker-entrypoint.sh +++ b/web-apache-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/centos/docker-entrypoint.sh b/web-apache-mysql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-mysql/centos/docker-entrypoint.sh +++ b/web-apache-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-mysql/ubuntu/docker-entrypoint.sh b/web-apache-mysql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-mysql/ubuntu/docker-entrypoint.sh +++ b/web-apache-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/alpine/docker-entrypoint.sh b/web-apache-pgsql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-pgsql/alpine/docker-entrypoint.sh +++ b/web-apache-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/centos/docker-entrypoint.sh b/web-apache-pgsql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-pgsql/centos/docker-entrypoint.sh +++ b/web-apache-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-apache-pgsql/ubuntu/docker-entrypoint.sh b/web-apache-pgsql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-apache-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-apache-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index fff90979b..2a7535682 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -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"] diff --git a/web-nginx-mysql/alpine/conf/etc/php5/conf.d/99-zabbix.ini b/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini similarity index 82% rename from web-nginx-mysql/alpine/conf/etc/php5/conf.d/99-zabbix.ini rename to web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index 49f9dbb5f..3cdeb81f2 100644 --- a/web-nginx-mysql/alpine/conf/etc/php5/conf.d/99-zabbix.ini +++ b/web-nginx-mysql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -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 diff --git a/web-nginx-mysql/alpine/conf/etc/php5/php-fpm.conf b/web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf similarity index 100% rename from web-nginx-mysql/alpine/conf/etc/php5/php-fpm.conf rename to web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf diff --git a/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 4d4146a93..70b6b577b 100644 --- a/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-mysql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -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 diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 210da3c0c..e25446185 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -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"] diff --git a/web-nginx-pgsql/alpine/conf/etc/php5/conf.d/99-zabbix.ini b/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini similarity index 82% rename from web-nginx-pgsql/alpine/conf/etc/php5/conf.d/99-zabbix.ini rename to web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini index 49f9dbb5f..3cdeb81f2 100644 --- a/web-nginx-pgsql/alpine/conf/etc/php5/conf.d/99-zabbix.ini +++ b/web-nginx-pgsql/alpine/conf/etc/php7/conf.d/99-zabbix.ini @@ -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 diff --git a/web-nginx-pgsql/alpine/conf/etc/php5/php-fpm.conf b/web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf similarity index 100% rename from web-nginx-pgsql/alpine/conf/etc/php5/php-fpm.conf rename to web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -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 diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/alpine/docker-entrypoint.sh b/zabbix-appliance/alpine/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/zabbix-appliance/alpine/docker-entrypoint.sh +++ b/zabbix-appliance/alpine/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/centos/docker-entrypoint.sh b/zabbix-appliance/centos/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/zabbix-appliance/centos/docker-entrypoint.sh +++ b/zabbix-appliance/centos/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/rhel/docker-entrypoint.sh b/zabbix-appliance/rhel/docker-entrypoint.sh index 9aa65cf60..e2b1a2061 100755 --- a/zabbix-appliance/rhel/docker-entrypoint.sh +++ b/zabbix-appliance/rhel/docker-entrypoint.sh @@ -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 diff --git a/zabbix-appliance/ubuntu/docker-entrypoint.sh b/zabbix-appliance/ubuntu/docker-entrypoint.sh index e85cb6f6e..8d0fbd616 100755 --- a/zabbix-appliance/ubuntu/docker-entrypoint.sh +++ b/zabbix-appliance/ubuntu/docker-entrypoint.sh @@ -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