extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2024-12-15 19:10:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Nginx configuration on Alpine 3.14

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-07-01 04:25:15 -04:00
parent ea6fe8fbab
commit 76edafeb24
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-nginx-mysql/alpine/Dockerfile
View File

@ -47,7 +47,7 @@ RUN set -eux && \
php7-openssl \ php7-openssl \
supervisor && \ supervisor && \
rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*

2
web-nginx-mysql/alpine/conf/etc/nginx/nginx.conf
View File

@ -67,5 +67,5 @@ http {
index index.php; index index.php;
server_tokens off; server_tokens off;
include /etc/nginx/conf.d/*.conf; include /etc/nginx/http.d/*.conf;
} }

2
web-nginx-mysql/alpine/docker-entrypoint.sh
View File

@ -146,7 +146,7 @@ check_db_connect() {
} }
prepare_web_server() { prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_CONFD_DIR="/etc/nginx/http.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"

2
web-nginx-pgsql/alpine/Dockerfile
View File

@ -46,7 +46,7 @@ RUN set -eux && \
postgresql-client \ postgresql-client \
supervisor && \ supervisor && \
rm -rf /etc/php7/php-fpm.d/www.conf && \ rm -rf /etc/php7/php-fpm.d/www.conf && \
rm -f /etc/nginx/conf.d/*.conf && \ rm -f /etc/nginx/http.d/*.conf && \
ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \ ln -sf /dev/fd/2 /var/lib/nginx/logs/error.log && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*

2
web-nginx-pgsql/alpine/conf/etc/nginx/nginx.conf
View File

@ -67,5 +67,5 @@ http {
index index.php; index index.php;
server_tokens off; server_tokens off;
include /etc/nginx/conf.d/*.conf; include /etc/nginx/http.d/*.conf;
} }

2
web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -130,7 +130,7 @@ check_db_connect() {
} }
prepare_web_server() { prepare_web_server() {
NGINX_CONFD_DIR="/etc/nginx/conf.d" NGINX_CONFD_DIR="/etc/nginx/http.d"
NGINX_SSL_CONFIG="/etc/ssl/nginx" NGINX_SSL_CONFIG="/etc/ssl/nginx"
echo "** Adding Zabbix virtual host (HTTP)" echo "** Adding Zabbix virtual host (HTTP)"