diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index b9de349cc..ab7707961 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -80,9 +80,9 @@ RUN set -eux && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php7/ && \ chgrp -R 0 /etc/apache2/ /etc/php7/ && \ chmod -R g=u /etc/apache2/ /etc/php7/ && \ diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 1beda6fa0..8745f8629 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -72,9 +72,9 @@ RUN set -eux && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/httpd/ /etc/php.d/ /etc/php.ini && \ chgrp -R 0 /etc/httpd/ /etc/php.d/ /etc/php.ini && \ chmod -R g=u /etc/httpd/ /etc/php.d/ /etc/php.ini && \ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 1da23fdc2..ee94842b2 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -90,9 +90,9 @@ RUN set -eux && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ 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/ && \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index c94e37e05..c2ef044a6 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -79,9 +79,9 @@ RUN set -eux && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/apache2/ /etc/php7/ && \ chgrp -R 0 /etc/apache2/ /etc/php7/ && \ chmod -R g=u /etc/apache2/ /etc/php7/ && \ diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index afab1ef6c..60e39a54e 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -72,9 +72,9 @@ RUN set -eux && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/httpd/ /etc/php.d/ /etc/php.ini && \ chgrp -R 0 /etc/httpd/ /etc/php.d/ /etc/php.ini && \ chmod -R g=u /etc/httpd/ /etc/php.d/ /etc/php.ini && \ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 94e4c183c..1a7746ea6 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -90,9 +90,9 @@ RUN set -eux && \ dpkg-reconfigure locales && \ find /usr/share/zabbix/locale -name '*.po' | xargs rm -f && \ find /usr/share/zabbix/locale -name '*.sh' | xargs rm -f && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ 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/ && \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 1c9dd66c3..3a9628ec3 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -44,6 +44,7 @@ RUN set -eux && \ supervisor && \ rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/nginx/conf.d/*.conf && \ + ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=master @@ -73,15 +74,15 @@ RUN set -eux && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ chgrp -R 0 /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ chmod -R g=u /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ - 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 /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/ && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index 9a650687f..ba60a4575 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -222,8 +222,6 @@ prepare_web_server() { else echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." fi - - ln -sf /dev/fd/2 /var/log/nginx/error.log } clear_deploy() { diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 2601f5698..6857b387e 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -68,9 +68,9 @@ RUN set -eux && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh index 1c30c3b72..71a09fd28 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -222,8 +222,6 @@ prepare_web_server() { else echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." fi - - ln -sf /dev/fd/2 /var/log/nginx/error.log } clear_deploy() { diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index e709da6ac..eeabfcef6 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -43,6 +43,7 @@ RUN set -eux && \ supervisor && \ rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/nginx/conf.d/*.conf && \ + ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ rm -rf /var/cache/apk/* ARG MAJOR_VERSION=master @@ -72,15 +73,15 @@ RUN set -eux && \ rm -rf tests && \ ./locale/make_mo.sh && \ ln -s "/etc/zabbix/web/zabbix.conf.php" "/usr/share/zabbix/conf/zabbix.conf.php" && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ chgrp -R 0 /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ chmod -R g=u /etc/nginx/ /etc/php7/php-fpm.d/ /etc/php7/php-fpm.conf && \ - 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 /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/ && \ apk del --purge --no-network \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 6dd291bee..6513702b1 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -222,8 +222,6 @@ prepare_web_server() { else echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." fi - - ln -sf /dev/fd/2 /var/log/nginx/error.log } clear_deploy() { diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index cb94f70df..497e4c868 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -68,9 +68,9 @@ RUN set -eux && \ cat /usr/share/zabbix/include/locales.inc.php | grep display | grep true | awk '{$1=$1};1' | \ cut -d"'" -f 2 | sort | \ xargs -I '{}' bash -c 'echo "{}" && localedef -c -i {} -f UTF-8 {}.UTF-8 2>/dev/null' && \ - chown --quiet -R zabbix:root /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chgrp -R 0 /etc/zabbix/ /usr/share/zabbix/conf/ && \ - chmod -R g=u /etc/zabbix/ /usr/share/zabbix/conf/ && \ + chown --quiet -R zabbix:root /etc/zabbix/ && \ + chgrp -R 0 /etc/zabbix/ && \ + chmod -R g=u /etc/zabbix/ && \ chown --quiet -R zabbix:root /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ chgrp -R 0 /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ chmod -R g=u /etc/nginx/ /etc/php-fpm.d/ /etc/php-fpm.conf && \ diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh index 34c2a877e..9a748c5f5 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -222,8 +222,6 @@ prepare_web_server() { else echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." fi - - ln -sf /dev/fd/2 /var/log/nginx/error.log } clear_deploy() { diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh index a55aae6d9..8b26add5e 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -222,8 +222,6 @@ prepare_web_server() { else echo "**** Impossible to enable SSL support for Nginx. Certificates are missed." fi - - ln -sf /dev/fd/2 /var/log/nginx/error.log } clear_deploy() {