More .env and compose updates

.env

@@ -14,10 +14,10 @@ NGINX_SSLPORT_HOST=8443
 
 # CKAN databases
 POSTGRES_USER=postgres
-POSTGRES_PASSWORD=admindbpassword
-POSTGRES_DB=admindb
-PGDATA=/var/lib/postgresql/data/db
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
 POSTGRES_HOST=db
+PGDATA=/var/lib/postgresql/data/db
 CKAN_DB_USER=ckandbuser
 CKAN_DB_PASSWORD=ckandbpassword
 CKAN_DB=ckandb

.env.example

@@ -13,13 +13,18 @@ NGINX_PORT_HOST=81
 NGINX_SSLPORT_HOST=8443
 
 # CKAN databases
-POSTGRES_USER=ckan
-POSTGRES_PASSWORD=ckan
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=postgres
+POSTGRES_HOST=db
+CKAN_DB_USER=ckandbuser
+CKAN_DB_PASSWORD=ckandbpassword
+CKAN_DB=ckandb
 DATASTORE_READONLY_USER=datastore_ro
 DATASTORE_READONLY_PASSWORD=datastore
-POSTGRES_HOST=db
-CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
-CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
+DATASTORE_DB=datastore
+CKAN_SQLALCHEMY_URL=postgresql://ckandbuser:ckandbpassword@db/ckandb
+CKAN_DATASTORE_WRITE_URL=postgresql://ckandbuser:ckandbpassword@db/datastore
 CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
 
 # Test database connections
@@ -30,7 +35,7 @@ TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_te
 # CKAN core
 CKAN_VERSION=2.10.0
 CKAN_SITE_ID=default
-CKAN_SITE_URL=http://ckan:5000
+CKAN_SITE_URL=https://localhost:8443
 CKAN_PORT=5000
 CKAN_PORT_HOST=5000
 CKAN___BEAKER__SESSION__SECRET=CHANGE_ME

docker-compose.dev.yml

@@ -43,14 +43,10 @@ services:
     container_name: ${POSTGRESQL_CONTAINER_NAME}
     build:
       context: postgresql/
-      args:
-       - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD}
-       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     environment:
-      - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - CKAN_DB_PASSWORD=${CKAN_DB_PASSWORD}
-      - PGDATA=/var/lib/postgresql/data/db
+      - DATASTORE_READONLY_PASSWORD
+      - POSTGRES_PASSWORD
+      - CKAN_DB_PASSWORD
     volumes:
       - pg_data:/var/lib/postgresql/data
     restart: unless-stopped

docker-compose.yml

@@ -65,16 +65,16 @@ services:
     networks:
       - dbnet
     environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
-      - PGDATA=${PGDATA}
-      - CKAN_DB_USER=${CKAN_DB_USER}
-      - CKAN_DB_PASSWORD=${CKAN_DB_PASSWORD}
-      - CKAN_DB=${CKAN_DB}
-      - DATASTORE_READONLY_USER=${DATASTORE_READONLY_USER} 
-      - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD}
-      - DATASTORE_DB=${DATASTORE_DB}
+      - POSTGRES_USER
+      - POSTGRES_PASSWORD
+      - POSTGRES_DB
+      - PGDATA
+      - CKAN_DB_USER
+      - CKAN_DB_PASSWORD
+      - CKAN_DB
+      - DATASTORE_READONLY_USER
+      - DATASTORE_READONLY_PASSWORD
+      - DATASTORE_DB
     volumes:
       - pg_data:/var/lib/postgresql/data
     restart: unless-stopped
@@ -105,5 +105,8 @@ networks:
   webnet:
   ckannet:
   solrnet:
+    internal: true
   dbnet:
+    internal: true
   redisnet:
+    internal: true