From 2e448015cdf61c40c758731b0e1f821280f519f0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 29 May 2019 13:57:51 +0300 Subject: [PATCH] Fixed assets directory permissions --- snmptraps/alpine/Dockerfile | 1 - web-apache-mysql/alpine/Dockerfile | 1 + web-apache-mysql/centos/Dockerfile | 1 + web-apache-mysql/ubuntu/Dockerfile | 1 + web-apache-pgsql/alpine/Dockerfile | 1 + web-apache-pgsql/centos/Dockerfile | 1 + web-apache-pgsql/ubuntu/Dockerfile | 1 + web-nginx-mysql/alpine/Dockerfile | 1 + web-nginx-mysql/centos/Dockerfile | 1 + web-nginx-mysql/ubuntu/Dockerfile | 1 + web-nginx-pgsql/alpine/Dockerfile | 1 + web-nginx-pgsql/centos/Dockerfile | 1 + web-nginx-pgsql/ubuntu/Dockerfile | 1 + zabbix-appliance/alpine/Dockerfile | 1 + zabbix-appliance/centos/Dockerfile | 2 +- zabbix-appliance/ubuntu/Dockerfile | 1 + 16 files changed, 15 insertions(+), 2 deletions(-) diff --git a/snmptraps/alpine/Dockerfile b/snmptraps/alpine/Dockerfile index c5b45d839..e77b1a552 100644 --- a/snmptraps/alpine/Dockerfile +++ b/snmptraps/alpine/Dockerfile @@ -53,7 +53,6 @@ RUN addgroup zabbix && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ cd /tmp/ && \ tar -zxvf snmptrapfmt_1.14+nmu1ubuntu2.tar.gz && \ - ls -lah && \ cd /tmp/snmptrapfmt-1.14+nmu1ubuntu1/ && \ patch -p1 < ./patches/makefile.patch && \ make -j"$(nproc)" -s && \ diff --git a/web-apache-mysql/alpine/Dockerfile b/web-apache-mysql/alpine/Dockerfile index 0e869b6c7..a4f017326 100644 --- a/web-apache-mysql/alpine/Dockerfile +++ b/web-apache-mysql/alpine/Dockerfile @@ -76,6 +76,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ + chown --quiet -R apache:apache /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-mysql/centos/Dockerfile b/web-apache-mysql/centos/Dockerfile index 9eb0222dc..c0146cf14 100644 --- a/web-apache-mysql/centos/Dockerfile +++ b/web-apache-mysql/centos/Dockerfile @@ -79,6 +79,7 @@ RUN groupadd --system zabbix && \ 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 apache:apache /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTANT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-apache-mysql/ubuntu/Dockerfile b/web-apache-mysql/ubuntu/Dockerfile index 61c843afb..fa3632939 100644 --- a/web-apache-mysql/ubuntu/Dockerfile +++ b/web-apache-mysql/ubuntu/Dockerfile @@ -84,6 +84,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ 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 www-data:www-data /usr/share/zabbix && \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ gettext \ ca-certificates \ diff --git a/web-apache-pgsql/alpine/Dockerfile b/web-apache-pgsql/alpine/Dockerfile index b6cb970f6..1982a3de0 100644 --- a/web-apache-pgsql/alpine/Dockerfile +++ b/web-apache-pgsql/alpine/Dockerfile @@ -75,6 +75,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ + chown --quiet -R apache:apache /usr/share/zabbix/ && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-apache-pgsql/centos/Dockerfile b/web-apache-pgsql/centos/Dockerfile index cdb10f2c6..abb82f101 100644 --- a/web-apache-pgsql/centos/Dockerfile +++ b/web-apache-pgsql/centos/Dockerfile @@ -80,6 +80,7 @@ RUN groupadd --system zabbix && \ 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 apache:apache /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ diff --git a/web-apache-pgsql/ubuntu/Dockerfile b/web-apache-pgsql/ubuntu/Dockerfile index 2df4e158a..449ee7a1e 100644 --- a/web-apache-pgsql/ubuntu/Dockerfile +++ b/web-apache-pgsql/ubuntu/Dockerfile @@ -93,6 +93,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ 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 www-data:www-data /usr/share/zabbix && \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ gettext \ patch \ diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 0a5ec356b..c1433bc66 100644 --- a/web-nginx-mysql/alpine/Dockerfile +++ b/web-nginx-mysql/alpine/Dockerfile @@ -77,6 +77,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile index 1e9715c1e..d10d1ab57 100644 --- a/web-nginx-mysql/centos/Dockerfile +++ b/web-nginx-mysql/centos/Dockerfile @@ -81,6 +81,7 @@ RUN groupadd --system zabbix && \ 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 nginx:nginx /usr/share/zabbix && \ rm -f /etc/php-fpm.d/www.conf && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile index b0691e482..5a5e7b731 100644 --- a/web-nginx-mysql/ubuntu/Dockerfile +++ b/web-nginx-mysql/ubuntu/Dockerfile @@ -105,6 +105,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ 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 www-data:www-data /usr/share/zabbix && \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ gettext \ ca-certificates \ diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile index 44f600eda..b233ec5ee 100644 --- a/web-nginx-pgsql/alpine/Dockerfile +++ b/web-nginx-pgsql/alpine/Dockerfile @@ -76,6 +76,7 @@ RUN apk add ${APK_FLAGS_DEV} --virtual build-dependencies \ rm -f conf/zabbix.conf.php && \ rm -rf tests && \ ./locale/make_mo.sh && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ apk del ${APK_FLAGS_COMMON} --purge \ build-dependencies && \ rm -rf /var/cache/apk/* diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile index 8f418b753..e9f11eba6 100644 --- a/web-nginx-pgsql/centos/Dockerfile +++ b/web-nginx-pgsql/centos/Dockerfile @@ -79,6 +79,7 @@ RUN groupadd --system zabbix && \ 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 nginx:nginx /usr/share/zabbix && \ rm -f /etc/php-fpm.d/www.conf && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile index aa0a9bacc..96f84d76c 100644 --- a/web-nginx-pgsql/ubuntu/Dockerfile +++ b/web-nginx-pgsql/ubuntu/Dockerfile @@ -105,6 +105,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ 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 www-data:www-data /usr/share/zabbix && \ DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \ gettext \ ca-certificates \ diff --git a/zabbix-appliance/alpine/Dockerfile b/zabbix-appliance/alpine/Dockerfile index 346da8610..cabd78a24 100644 --- a/zabbix-appliance/alpine/Dockerfile +++ b/zabbix-appliance/alpine/Dockerfile @@ -135,6 +135,7 @@ RUN addgroup zabbix && \ mkdir -p /var/lib/zabbix/ssl/keys && \ mkdir -p /var/lib/zabbix/ssl/ssl_ca && \ chown --quiet -R zabbix:root /var/lib/zabbix && \ + chown --quiet -R nginx:nginx /usr/share/zabbix && \ mkdir -p /usr/share/doc/zabbix-${ZBX_TYPE}-${ZBX_DB_TYPE}/ && \ apk update && \ apk add ${APK_FLAGS_PERSISTENT} \ diff --git a/zabbix-appliance/centos/Dockerfile b/zabbix-appliance/centos/Dockerfile index dd1ca037d..a607bea50 100644 --- a/zabbix-appliance/centos/Dockerfile +++ b/zabbix-appliance/centos/Dockerfile @@ -168,10 +168,10 @@ RUN groupadd --system zabbix && \ rm -f /etc/php-fpm.d/www.conf && \ mkdir -p /var/lib/php/ && \ chown --quiet -R nginx:nginx /var/lib/php/ && \ - ls -lah /usr/share/zabbix/ && \ 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 nginx:nginx /usr/share/zabbix && \ yum ${YUM_FLAGS_PERSISTENT} clean all && \ rm -rf /var/cache/yum/ && \ chmod +x /sbin/tini diff --git a/zabbix-appliance/ubuntu/Dockerfile b/zabbix-appliance/ubuntu/Dockerfile index 7b598c861..65422deae 100644 --- a/zabbix-appliance/ubuntu/Dockerfile +++ b/zabbix-appliance/ubuntu/Dockerfile @@ -202,6 +202,7 @@ RUN apt-get ${APT_FLAGS_COMMON} update && \ 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 "{}.UTF-8 UTF-8" >> /var/lib/locales/supported.d/local' && \ + chown --quiet -R www-data:www-data /usr/share/zabbix && \ dpkg-reconfigure locales && \ apt-get ${APT_FLAGS_COMMON} autoremove && \ apt-get ${APT_FLAGS_COMMON} clean && \