docker-compose.yml and entrypoint: sanitise port settings

contrib/docker/ckan-entrypoint.sh

@@ -82,7 +82,7 @@ if [ -z "$CKAN_SQLALCHEMY_URL" ]; then
 
     # wait for postgres db to be available, immediately after creation
     # its entrypoint creates the cluster and dbs and this can take a moment
-    for tries in $(seq 30); do
+    for tries in $(seq 60); do
       psql -c 'SELECT 1;' 2> /dev/null && break
       sleep 0.3
     done

contrib/docker/docker-compose.yml

@@ -1,8 +1,5 @@
-# docker-compose build && docker-compose up
-# If you experience problems with the CKAN container not being
-# able to connect to the DB, then most likely the DB has not
-# started up quickly enough. Just do "docker-compose up ckan"
-# again to retry
+# docker-compose build && docker-compose up -d
+# If "docker-compose logs ckan" shows DB not ready, run "docker-compose restart ckan" a few times.
 version: "3"
 
 volumes:
@@ -44,8 +41,6 @@ services:
       context: postgresql/
       args:
         - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-    ports:
-      - "127.0.0.1:${POSTGRES_PORT}:5432"
     environment:
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     volumes:
@@ -54,11 +49,7 @@ services:
   solr:
     container_name: solr
     image: ckan/solr:latest
-    ports:
-        - "0.0.0.0:8983:8983"
 
   redis:
     container_name: redis
     image: redis:latest
-    ports:
-      - "127.0.0.1:6379:6379"