Remove default Nginx configuration on image building stage

This commit is contained in:
Alexey Pustovalov
2019-11-01 01:57:01 +02:00
parent fa68313fb4
commit 406f32db80
12 changed files with 6 additions and 18 deletions

View File

@ -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' && \

View File

@ -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"