working setup with custom CKAN_PORT, but POSTGRES_PORT must be 5432

ckan · Jul 10, 2017 · 40c6f47 · 40c6f47
1 parent c5d0e33
commit 40c6f47
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/contrib/docker/.env.template b/contrib/docker/.env.template
@@ -23,4 +23,4 @@ POSTGRES_PASSWORD=ckan
 # POSTGRES_PORT needs to be available on the host
 # Which ports are taken: sudo netstat -na | grep 54
 # To apply change: docker-compose down && docker rmi docker_db docker_ckan && docker-compose build
-POSTGRES_PORT=5435
+POSTGRES_PORT=5432
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
@@ -10,15 +10,15 @@ services:
     build:
       context: ../../
       args:
-        - CKAN_SITE_URL=${CKAN_SITE_URL}
+          - CKAN_SITE_URL=${CKAN_SITE_URL}:${CKAN_PORT}
     links:
       - db
       - solr
       - redis
     ports:
-      - "80:5000"
+      - "${CKAN_PORT}:5000"
     environment:
-      - CKAN_SQLALCHEMY_URL=postgresql://ckan:${POSTGRES_PASSWORD}@db:${POSTGRES_PORT}/ckan
+      - CKAN_SQLALCHEMY_URL=postgresql://ckan:${POSTGRES_PASSWORD}@db/ckan
       - CKAN_SITE_URL=${CKAN_SITE_URL}
       - DB_PORT_5432_TCP_ADDR=db
       - DB_PORT_5432_TCP_PORT=${POSTGRES_PORT}