Merge pull request #162 from mjanez/ckan-2.10.5

Add build arguments for CKAN and PyCSW locations for nginx service
mjanez · Nov 8, 2024 · e910d30 · e910d30
2 parents 91ee95a + fefadda
commit e910d30
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}
diff --git a/nginx/setup/html/github.svg b/nginx/setup/html/github.svg