Merge branch 'master' into trunk

2025-08-09 00:24:58 +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-mysql/alpine/Dockerfile
+++ b/web-nginx-mysql/alpine/Dockerfile
@ -54,6 +54,7 @@ RUN set -eux && \
            php7-xmlreader \
            php7-xmlwriter \
            supervisor && \
+    rm -f /etc/nginx/conf.d/*.conf && \
    rm -rf /var/cache/apk/*

 ARG MAJOR_VERSION=4.4