From 3067f09bcab562e079c7e8b689c7d75f4aaf9d3a Mon Sep 17 00:00:00 2001
From: fleischsalatinspace <fleischsalat@space>
Date: Wed, 22 Sep 2021 18:02:17 +0200
Subject: [PATCH] Dockerfile/entrypoint.sh: move templateSite.conf to
 /etc/nginx to prevent double files in sites_enabled

---
 Dockerfile           | 4 +++-
 static/entrypoint.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f76d0c2..e149c2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,9 @@ FROM trafex/alpine-nginx-php7:ba1dd422
 RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils
 
 COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf
-COPY static/nginx/site.conf  /etc/nginx/sites_enabled/templateSite.conf
+# we need to create sites_enabled directory in order for entrypoint.sh being able to copy file after envsubst
+RUN mkdir -p /etc/nginx/sites_enabled/
+COPY static/nginx/site.conf  /etc/nginx/templateSite.conf
 
 # Configure PHP-FPM
 COPY static/php/fpm-pool.conf /etc/php7/php-fpm.d/zzz_custom.conf
diff --git a/static/entrypoint.sh b/static/entrypoint.sh
index 008e74a..f627dfd 100644
--- a/static/entrypoint.sh
+++ b/static/entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 crontab /var/crontab.txt
-envsubst '$DOMAIN' </etc/nginx/sites_enabled/templateSite.conf >/etc/nginx/sites_enabled/site.conf
+envsubst '$DOMAIN' </etc/nginx/templateSite.conf >/etc/nginx/sites_enabled/site.conf
 envsubst '$CONTAINER_NAME' </etc/nginx/templateNginx.conf >/etc/nginx/nginx.conf
 envsubst  </var/www/html/pathfinder/app/templateEnvironment.ini >/var/www/html/pathfinder/app/environment.ini
 envsubst  </var/www/html/pathfinder/app/templateConfig.ini >/var/www/html/pathfinder/app/config.ini