Added nginx base image docker-entrypoint.sh to entrypoint so it can r…

…un docker-entrypoint.d scripts from base image to use nginx template files. Remove default values for env variables in template file
dbca-wa · Jan 22, 2024 · 499d409 · 499d409
1 parent ce56f27
commit 499d409
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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;'
+  /docker-entrypoint.sh nginx -g 'daemon off;'
diff --git 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;