From 5044430ceb84105f41e96d8f36a071ba388cdef7 Mon Sep 17 00:00:00 2001 From: amorozov Date: Fri, 8 Sep 2023 11:17:19 +0300 Subject: [PATCH] blablabla --- Dockerfile | 5 ++++- docker-entrypoint.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b350c39..9d2d981 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,10 @@ ENV NGINX_PROXY_SOURCE_PORT=${NGINX_PROXY_SOURCE_PORT:-"Please configure NGINX_P ENV NGINX_PROXY_SOURCE_ADDRESS=${NGINX_PROXY_SOURCE_ADDRESS:-"Please configure NGINX_PROXY_SOURCE_ADDRESS env!"} # Copy default nginx configuration -COPY default.nginx.conf /etc/nginx/nginx.conf +#COPY default.nginx.conf /etc/nginx/nginx.conf + +# Remove default nginx config +RUN rm -r /etc/nginx/nginx.conf # Copy entrypoint COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 025c255..1e42937 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -6,6 +6,24 @@ if [ -f "/invoke_initial_script.sh" ]; then source /invoke_initial_script.sh fi +# Проверяем наличие файла /etc/nginx/nginx.conf +if [ ! -f "/etc/nginx/nginx.conf" ]; then + # Заполняем файл /etc/nginx/nginx.conf с использованием переменных окружения + cat > /etc/nginx/nginx.conf <