From 499d40919f36dbd75f5a1b9ab25300d546c4b356 Mon Sep 17 00:00:00 2001
From: Mark Calvert <markcalvert84@gmail.com>
Date: Tue, 23 Jan 2024 09:32:03 +1300
Subject: [PATCH] Added nginx base image docker-entrypoint.sh to entrypoint so
 it can run docker-entrypoint.d scripts from base image to use nginx template
 files. Remove default values for env variables in template file

---
 nginx/Dockerfile                  | 2 +-
 nginx/setup/default.conf.template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 05aeb380..2e781263 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -21,4 +21,4 @@ ENTRYPOINT \
     -keyout ${NGINX_DIR}/certs/ckan-local.key \
     -out ${NGINX_DIR}/certs/ckan-local.crt \
     -days 365 && \
-  nginx -g 'daemon off;'
\ No newline at end of file
+  /docker-entrypoint.sh nginx -g 'daemon off;'
\ No newline at end of file
diff --git a/nginx/setup/default.conf.template b/nginx/setup/default.conf.template
index fb23b91a..00511652 100644
--- a/nginx/setup/default.conf.template
+++ b/nginx/setup/default.conf.template
@@ -22,7 +22,7 @@ server {
     #access_log  /var/log/nginx/host.access.log  main;
 
     location / {
-        proxy_pass http://${CKAN_CONTAINER_NAME:-ckan}:${CKAN_PORT:-5000}/;
+        proxy_pass http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}/;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $host;
         #proxy_cache cache;