Merge branch 'ckan-2.9.11' of https://github.com/mjanez/ckan-docker into ckan-2.9.11

.env.example

@@ -1,3 +1,4 @@
+# Base
 APP_DIR=/srv/app
 
 # Host Ports
@@ -71,6 +72,7 @@ TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_te
 
 # Dev settings
 USE_HTTPS_FOR_DEV=false
+CKAN_DEV_COMPOSE_SERVICE=ckan-dev
 
 # CKAN core
 ## If use docker-compose.ghcr.yml only "*.*.*" versions available in: https://github.com/mjanez/ckan-docker/pkgs/container/ckan-docker

apache/Dockerfile

@@ -2,8 +2,9 @@ FROM httpd:2.4-alpine
 
 ENV CKAN_PORT=5000
 ENV PYCSW_PORT=8000
-ENV PYCSW_CONTAINER_NAME=pycsw
-ENV CKAN_CONTAINER_NAME=ckan
+ENV PYCSW_COMPOSE_SERVICE=pycsw
+ENV CKAN_COMPOSE_SERVICE=ckan
+ENV CKAN_DEV_COMPOSE_SERVICE=ckan-dev
 ENV APACHE_PORT=80
 ENV APACHE_LOG_DIR=/var/log/apache
 ENV APACHE_ROOT=/usr/local/apache2
@@ -12,8 +13,8 @@ ENV PROXY_SERVER_NAME=localhost
 
 ENV PROXY_CKAN_LOCATION=/catalog
 ENV PROXY_PYCSW_LOCATION=/csw
-ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_COMPOSE_SERVICE}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_COMPOSE_SERVICE}:${CKAN_PORT}
 
 RUN mkdir -p ${APACHE_LOG_DIR}
 

docker-compose.dev.yml

@@ -14,8 +14,11 @@ services:
       dockerfile: Dockerfile
     env_file:
       - .env
+    environment:
+      - CKAN_COMPOSE_SERVICE=${CKAN_DEV_COMPOSE_SERVICE}
+      - PROXY_CKAN_PROXY_PASS=http://${CKAN_DEV_COMPOSE_SERVICE}:${CKAN_PORT}
     depends_on:
-      - ckan-dev
+      - ${CKAN_DEV_COMPOSE_SERVICE}
     ports:
       - "0.0.0.0:${APACHE_PORT_HOST}:${APACHE_PORT}"
     restart: on-failure:3

nginx/Dockerfile

@@ -2,13 +2,13 @@ FROM nginx:stable-alpine
 
 ENV CKAN_PORT=5000
 ENV PYCSW_PORT=8000
-ENV PYCSW_CONTAINER_NAME=pycsw
-ENV CKAN_CONTAINER_NAME=ckan
+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_CONTAINER_NAME}:${PYCSW_PORT}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_COMPOSE_SERVICE}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_COMPOSE_SERVICE}:${CKAN_PORT}
 
 ENV NGINX_PORT=80
 ENV NGINX_LOG_DIR=/var/log/nginx