Merge branch 'master' into trunk

2025-08-13 18:37:10 +02:00 · 2019-11-01 02:01:29 +02:00
parent b31cd586a8 406f32db80
commit 45f9fa03d8
12 changed files with 6 additions and 18 deletions
--- a/web-nginx-pgsql/centos/Dockerfile
+++ b/web-nginx-pgsql/centos/Dockerfile
@ -78,6 +78,7 @@ RUN set -eux && \
            php-mbstring \
            php-pgsql \
            php-xml && \
+    rm -f /etc/nginx/conf.d/*.conf && \
    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' && \