From fefadda8e2f04bb3ac830001a0a99252cf5239c4 Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:43:46 +0100
Subject: [PATCH] Add build arguments for CKAN and PyCSW locations for nginx
 service

---
 docker-compose.dev.yml      | 3 +++
 docker-compose.ghcr.yml     | 7 +++++--
 docker-compose.yml          | 3 +++
 nginx/Dockerfile            | 7 ++++---
 nginx/setup/html/github.svg | 1 -
 5 files changed, 15 insertions(+), 6 deletions(-)
 delete mode 100644 nginx/setup/html/github.svg

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d36fb40a..8e09d288 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -13,6 +13,9 @@ services:
     build:
       context: nginx/
       dockerfile: Dockerfile
+      args:
+          PROXY_CKAN_LOCATION: ${PROXY_CKAN_LOCATION}
+          PROXY_PYCSW_LOCATION: ${PROXY_PYCSW_LOCATION}
     env_file:
       - .env
     environment:
diff --git a/docker-compose.ghcr.yml b/docker-compose.ghcr.yml
index e96b1f6f..0988e2fe 100644
--- a/docker-compose.ghcr.yml
+++ b/docker-compose.ghcr.yml
@@ -12,13 +12,16 @@ services:
     build:
       context: nginx/
       dockerfile: Dockerfile
+      args:
+          PROXY_CKAN_LOCATION: ${PROXY_CKAN_LOCATION}
+          PROXY_PYCSW_LOCATION: ${PROXY_PYCSW_LOCATION}
     env_file:
       - .env
     logging:
       driver: "json-file"
       options:
-          max-size: "100m"
-          max-file: "10"
+        max-size: "100m"
+        max-file: "10"
     networks:
       - webnet
       - ckannet
diff --git a/docker-compose.yml b/docker-compose.yml
index f4e1b2a7..49cac765 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,9 @@ services:
     build:
       context: nginx/
       dockerfile: Dockerfile
+      args:
+          PROXY_CKAN_LOCATION: ${PROXY_CKAN_LOCATION}
+          PROXY_PYCSW_LOCATION: ${PROXY_PYCSW_LOCATION}
     env_file:
       - .env
     logging:
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index c66209c9..2d436314 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,12 +1,13 @@
 FROM nginx:stable-alpine
 
+ARG PROXY_CKAN_LOCATION=/catalog
+ARG PROXY_PYCSW_LOCATION=/csw
+
 ENV CKAN_PORT=5000
 ENV PYCSW_PORT=8000
 ENV PYCSW_COMPOSE_SERVICE=pycsw
 ENV CKAN_COMPOSE_SERVICE=ckan
 ENV PROXY_SERVER_NAME=localhost
-ENV PROXY_CKAN_LOCATION=/catalog
-ENV PROXY_PYCSW_LOCATION=/csw
 ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_COMPOSE_SERVICE}:${PYCSW_PORT}
 ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_COMPOSE_SERVICE}:${CKAN_PORT}
 
@@ -25,6 +26,6 @@ COPY setup/ckan-local.* ${NGINX_DIR}/certs/
 COPY setup/html/index.html setup/html/robots.txt ${NGINX_SHARE_HTML_DIR}/
 
 # Replace $PROXY_CKAN_LOCATION and $PROXY_PYCSW_LOCATION in index.html
-RUN sed -i "s|/catalog|${PROXY_CKAN_LOCATION}|g; s|/csw|${PROXY_PYCSW_LOCATION}|g" ${NGINX_SHARE_HTML_DIR}/index.html
+RUN sed -i "s|<a href=\"/catalog\">|<a href=\"${PROXY_CKAN_LOCATION}\">|g; s|<a href=\"/csw\">|<a href=\"${PROXY_PYCSW_LOCATION}\">|g" ${NGINX_SHARE_HTML_DIR}/index.html
 
 EXPOSE ${NGINX_PORT}
\ No newline at end of file
diff --git a/nginx/setup/html/github.svg b/nginx/setup/html/github.svg
deleted file mode 100644
index a3ff759d..00000000
--- a/nginx/setup/html/github.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><!--! Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) Copyright 2024 Fonticons, Inc. --><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3.3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5.3-6.2 2.3zm44.2-1.7c-2.9.7-4.9 2.6-4.6 4.9.3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3.7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3.3 2.9 2.3 3.9 1.6 1 3.6.7 4.3-.7.7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3.7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3.7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
\ No newline at end of file