From 406f32db8021afb2e8785b2d0b4c8a34a985eed8 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 1 Nov 2019 01:57:01 +0200
Subject: [PATCH] Remove default Nginx configuration on image building stage

---
 web-nginx-mysql/alpine/Dockerfile           | 1 +
 web-nginx-mysql/alpine/docker-entrypoint.sh | 3 ---
 web-nginx-mysql/centos/Dockerfile           | 1 +
 web-nginx-mysql/centos/docker-entrypoint.sh | 3 ---
 web-nginx-mysql/ubuntu/Dockerfile           | 1 +
 web-nginx-mysql/ubuntu/docker-entrypoint.sh | 3 ---
 web-nginx-pgsql/alpine/Dockerfile           | 1 +
 web-nginx-pgsql/alpine/docker-entrypoint.sh | 3 ---
 web-nginx-pgsql/centos/Dockerfile           | 1 +
 web-nginx-pgsql/centos/docker-entrypoint.sh | 3 ---
 web-nginx-pgsql/ubuntu/Dockerfile           | 1 +
 web-nginx-pgsql/ubuntu/docker-entrypoint.sh | 3 ---
 12 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile
index 5e7733093..3c762ecd1 100644
--- 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=master
diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh
index 2665cfd0d..9d07320e5 100755
--- a/web-nginx-mysql/alpine/docker-entrypoint.sh
+++ b/web-nginx-mysql/alpine/docker-entrypoint.sh
@@ -625,9 +625,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
diff --git a/web-nginx-mysql/centos/Dockerfile b/web-nginx-mysql/centos/Dockerfile
index a8b241f71..ce0a49d9b 100644
--- a/web-nginx-mysql/centos/Dockerfile
+++ b/web-nginx-mysql/centos/Dockerfile
@@ -80,6 +80,7 @@ RUN set -eux && \
             php-mysql \
             php-xml \
             supervisor && \
+    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' && \
diff --git a/web-nginx-mysql/centos/docker-entrypoint.sh b/web-nginx-mysql/centos/docker-entrypoint.sh
index 2665cfd0d..9d07320e5 100755
--- a/web-nginx-mysql/centos/docker-entrypoint.sh
+++ b/web-nginx-mysql/centos/docker-entrypoint.sh
@@ -625,9 +625,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
diff --git a/web-nginx-mysql/ubuntu/Dockerfile b/web-nginx-mysql/ubuntu/Dockerfile
index 37b54518e..b182ef961 100644
--- a/web-nginx-mysql/ubuntu/Dockerfile
+++ b/web-nginx-mysql/ubuntu/Dockerfile
@@ -65,6 +65,7 @@ RUN set -eux && \
             php7.2-mysql \
             php7.2-xml \
             supervisor && \
+    rm -f /etc/nginx/conf.d/*.conf && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             wget && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
diff --git a/web-nginx-mysql/ubuntu/docker-entrypoint.sh b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
index 2665cfd0d..9d07320e5 100755
--- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh
@@ -625,9 +625,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
diff --git a/web-nginx-pgsql/alpine/Dockerfile b/web-nginx-pgsql/alpine/Dockerfile
index c80037ef7..5176fb87a 100644
--- a/web-nginx-pgsql/alpine/Dockerfile
+++ b/web-nginx-pgsql/alpine/Dockerfile
@@ -53,6 +53,7 @@ RUN set -eux && \
             php7-xmlwriter \
             postgresql-client \
             supervisor && \
+    rm -f /etc/nginx/conf.d/*.conf && \
     rm -rf /var/cache/apk/*
 
 ARG MAJOR_VERSION=master
diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh
index 2665cfd0d..9d07320e5 100755
--- a/web-nginx-pgsql/alpine/docker-entrypoint.sh
+++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh
@@ -625,9 +625,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
diff --git a/web-nginx-pgsql/centos/Dockerfile b/web-nginx-pgsql/centos/Dockerfile
index 4490ab104..5124a4090 100644
--- 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' && \
diff --git a/web-nginx-pgsql/centos/docker-entrypoint.sh b/web-nginx-pgsql/centos/docker-entrypoint.sh
index c9922ed9f..d53256feb 100755
--- a/web-nginx-pgsql/centos/docker-entrypoint.sh
+++ b/web-nginx-pgsql/centos/docker-entrypoint.sh
@@ -617,9 +617,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"
diff --git a/web-nginx-pgsql/ubuntu/Dockerfile b/web-nginx-pgsql/ubuntu/Dockerfile
index 288023b23..9af40b9c1 100644
--- a/web-nginx-pgsql/ubuntu/Dockerfile
+++ b/web-nginx-pgsql/ubuntu/Dockerfile
@@ -65,6 +65,7 @@ RUN set -eux && \
             php7.2-pgsql \
             postgresql-client \
             supervisor && \
+    rm -f /etc/nginx/conf.d/*.conf && \
     DEBIAN_FRONTEND=noninteractive apt-get ${APT_FLAGS_COMMON} purge \
             wget && \
     apt-get ${APT_FLAGS_COMMON} autoremove && \
diff --git a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
index c9922ed9f..d53256feb 100755
--- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
+++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh
@@ -617,9 +617,6 @@ prepare_web_server_nginx() {
     NGINX_SSL_CONFIG="/etc/ssl/nginx"
     PHP_SESSIONS_DIR="/var/lib/php5"
 
-    echo "** Disable default vhosts"
-    rm -f $NGINX_CONFD_DIR/*.conf
-
     echo "** Adding Zabbix virtual host (HTTP)"
     if [ -f "$ZABBIX_ETC_DIR/nginx.conf" ]; then
         ln -s "$ZABBIX_ETC_DIR/nginx.conf" "$NGINX_CONFD_DIR"