Update Docker configurations: enhance Harvest privacy, switch to Nginx, and adjust proxy settings

Author: mjanez

ckan/Dockerfile

@@ -15,7 +15,7 @@ COPY req_fixes req_fixes
 
 # CKAN configuration & extensions
 ## XLoader - 1.0.1-stable (mjanez/Forked fixed version) ##
-## Harvest - v1.5.6 (Worker with supervisor) ##
+## Harvest - v1.5.6 (mjanez Enhanced Privacy and Security for Remote Harvesting) ##
 ## Geoview - v0.2.0 ##
 ## Spatial - v2.1.1 ##
 ## DCAT - v1.8.0-alpha (Latest old version for IEPNB) ##
@@ -39,7 +39,7 @@ RUN echo ${TZ} > /etc/timezone && \
     pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-xloader/requirements.txt && \
     pip3 install --no-cache-dir -U requests[security] && \
     echo "ckan/ckanext-harvest" && \
-    pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#egg=ckanext-harvest && \
+    pip3 install --no-cache-dir -e git+https://github.com/mjanez/ckanext-harvest.git@v1.5.6#egg=ckanext-harvest && \
     pip3 install --no-cache-dir -r ${APP_DIR}/src/ckanext-harvest/requirements.txt && \
     echo "ckan/ckanext-geoview" && \
     pip3 install --no-cache-dir -e git+https://github.com/ckan/ckanext-geoview.git@v0.2.0#egg=ckanext-geoview && \

docker-compose.dev.yml

@@ -9,15 +9,18 @@ volumes:
 
 
 services:
-  apache:
+  nginx:
     build:
-      context: apache/
+      context: nginx/
       dockerfile: Dockerfile
+      args:
+          PROXY_CKAN_LOCATION: ${PROXY_CKAN_LOCATION}
+          PROXY_PYCSW_LOCATION: ${PROXY_PYCSW_LOCATION}
     env_file:
       - .env
     environment:
       - CKAN_COMPOSE_SERVICE=${CKAN_DEV_COMPOSE_SERVICE}
-      - PROXY_CKAN_PROXY_PASS=http://${CKAN_DEV_COMPOSE_SERVICE}:${CKAN_PORT}
+      - PROXY_CKAN_PROXY_PASS=http://${CKAN_DEV_COMPOSE_SERVICE}:5000
     logging:
       driver: "json-file"
       options:
@@ -26,7 +29,8 @@ services:
     depends_on:
       - ${CKAN_DEV_COMPOSE_SERVICE}
     ports:
-      - "0.0.0.0:${APACHE_PORT_HOST}:${APACHE_PORT}"
+      - "0.0.0.0:${NGINX_PORT_HOST}:${NGINX_PORT}"
+      - "0.0.0.0:${NGINX_SSLPORT_HOST}:${NGINX_SSLPORT}"
     restart: on-failure:3
 
   ckan-dev:

docker-compose.ghcr.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:

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: