diff --git a/java-gateway/alpine/Dockerfile b/java-gateway/alpine/Dockerfile index c3b691b0f..0b25125db 100644 --- a/java-gateway/alpine/Dockerfile +++ b/java-gateway/alpine/Dockerfile @@ -17,6 +17,8 @@ RUN set -eux && \ -h /var/lib/zabbix/ \ zabbix && \ mkdir -p /etc/zabbix/ && \ + mkdir -p /usr/sbin/zabbix_java/ && \ + mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \ apk add --clean-protected --no-cache \ bash \ openjdk8-jre-base && \ diff --git a/java-gateway/centos/Dockerfile b/java-gateway/centos/Dockerfile index 191789e7f..e86c7fdc1 100644 --- a/java-gateway/centos/Dockerfile +++ b/java-gateway/centos/Dockerfile @@ -17,6 +17,7 @@ RUN set -eux && \ zabbix && \ mkdir -p /etc/zabbix/ && \ mkdir -p /usr/sbin/zabbix_java/ && \ + mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \ yum --quiet makecache && \ yum -y install --setopt=tsflags=nodocs \ java-1.8.0-openjdk-headless && \ diff --git a/java-gateway/ubuntu/Dockerfile b/java-gateway/ubuntu/Dockerfile index e950c6fda..a51d56332 100644 --- a/java-gateway/ubuntu/Dockerfile +++ b/java-gateway/ubuntu/Dockerfile @@ -19,6 +19,8 @@ RUN set -eux && \ --home /var/lib/zabbix/ \ zabbix && \ mkdir -p /etc/zabbix/ && \ + mkdir -p /usr/sbin/zabbix_java/ && \ + mkdir -p /usr/sbin/zabbix_java/ext_lib/ && \ apt-get -y update && \ DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ openjdk-8-jre-headless && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index e7573c185..5f045c0e7 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -86,6 +86,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php7/ && \ chgrp -R 0 /etc/apache2/ /etc/php7/ && \ chmod -R g=u /etc/apache2/ /etc/php7/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 231dca994..53977cc4c 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -81,6 +81,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /run/httpd/ /var/lib/php/session/ && \ chgrp -R 0 /run/httpd/ /var/lib/php/session/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index d018ca100..273094049 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -96,6 +96,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \ chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \ chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ DEBIAN_FRONTEND=noninteractive apt-get -y purge \ gettext \ git && \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index 47176553c..3126c7826 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -85,6 +85,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php7/ && \ chgrp -R 0 /etc/apache2/ /etc/php7/ && \ chmod -R g=u /etc/apache2/ /etc/php7/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index 2e61695c0..503d801fd 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -81,6 +81,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /run/httpd/ /var/lib/php/session/ && \ chgrp -R 0 /run/httpd/ /var/lib/php/session/ && \ chmod -R g=u /run/httpd/ /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 8c09729be..7465b79d2 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -96,6 +96,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php/7.2/ && \ chgrp -R 0 /etc/apache2/ /etc/php/7.2/ && \ chmod -R g=u /etc/apache2/ /etc/php/7.2/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ DEBIAN_FRONTEND=noninteractive apt-get -y purge \ gettext \ git && \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index eb84db213..fc17edca4 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -83,6 +83,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* 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 0b0c0e771..6268ac47c 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 @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 15318e9d1..53dcc4c1e 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -77,6 +77,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 56e330bae..5b10705cf 100644 --- a/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-mysql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index c7683ed0c..fe77be554 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -109,6 +109,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ DEBIAN_FRONTEND=noninteractive apt-get -y purge \ gettext \ git && \ diff --git a/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index f8968e5c6..41e8acc56 100644 --- a/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-mysql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index e6a3a4f4b..86788efdc 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -82,6 +82,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ /var/lib/nginx/ && \ chgrp -R 0 /var/lib/php/session/ /var/lib/nginx/ && \ chmod -R g=u /var/lib/php/session/ /var/lib/nginx/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 0b0c0e771..6268ac47c 100644 --- a/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-pgsql/alpine/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 22a338f09..1fe3b86c5 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -77,6 +77,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ yum -y history undo `yum -q history | sed -n 3p |column -t | cut -d' ' -f1` && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index 56e330bae..5b10705cf 100644 --- a/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-pgsql/centos/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index b225579db..9cc518d5a 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -109,6 +109,9 @@ RUN set -eux && \ chown --quiet -R zabbix:root /var/lib/php/session/ && \ chgrp -R 0 /var/lib/php/session/ && \ chmod -R g=u /var/lib/php/session/ && \ + chown --quiet -R zabbix:root /usr/share/zabbix/include/defines.inc.php && \ + chgrp -R 0 /usr/share/zabbix/include/defines.inc.php && \ + chmod -R g=u /usr/share/zabbix/include/defines.inc.php && \ DEBIAN_FRONTEND=noninteractive apt-get -y purge \ gettext \ git && \ diff --git a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf index f8968e5c6..41e8acc56 100644 --- a/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf +++ b/web-nginx-pgsql/ubuntu/conf/etc/supervisor/conf.d/supervisord_zabbix.conf @@ -2,7 +2,7 @@ nodaemon = true [program:nginx] -command = /usr/sbin/%(program_name)s -g "daemon off;" -c /etc/nginx/%(program_name)s.conf +command = /usr/sbin/%(program_name)s -g "daemon off;error_log /dev/stdout info;" -c /etc/nginx/%(program_name)s.conf auto_start = true autorestart = true