diff --git a/web-nginx-mysql/alpine/Dockerfile b/web-nginx-mysql/alpine/Dockerfile index 68c4964da..84ddb7b24 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=4.4 diff --git a/web-nginx-mysql/alpine/docker-entrypoint.sh b/web-nginx-mysql/alpine/docker-entrypoint.sh index 20e78e0da..268921f46 100755 --- a/web-nginx-mysql/alpine/docker-entrypoint.sh +++ b/web-nginx-mysql/alpine/docker-entrypoint.sh @@ -638,9 +638,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 b480da91e..3e553633d 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 20e78e0da..268921f46 100755 --- a/web-nginx-mysql/centos/docker-entrypoint.sh +++ b/web-nginx-mysql/centos/docker-entrypoint.sh @@ -638,9 +638,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 a73775be0..f542e2b6e 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 20e78e0da..268921f46 100755 --- a/web-nginx-mysql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-mysql/ubuntu/docker-entrypoint.sh @@ -638,9 +638,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 cb2c23bd7..e1bff0888 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=4.4 diff --git a/web-nginx-pgsql/alpine/docker-entrypoint.sh b/web-nginx-pgsql/alpine/docker-entrypoint.sh index 20e78e0da..268921f46 100755 --- a/web-nginx-pgsql/alpine/docker-entrypoint.sh +++ b/web-nginx-pgsql/alpine/docker-entrypoint.sh @@ -638,9 +638,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 8a43c64ce..92c4b8184 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 bc758f3eb..a88256a9d 100755 --- a/web-nginx-pgsql/centos/docker-entrypoint.sh +++ b/web-nginx-pgsql/centos/docker-entrypoint.sh @@ -630,9 +630,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 d66fe2b64..6af2f44c9 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 bc758f3eb..a88256a9d 100755 --- a/web-nginx-pgsql/ubuntu/docker-entrypoint.sh +++ b/web-nginx-pgsql/ubuntu/docker-entrypoint.sh @@ -630,9 +630,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"