CatalogueRevamping
/
docker-ckan
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More .env and compose updates

This commit is contained in:
Brett 2023-06-13 14:24:18 +02:00
parent 969494b9aa
commit 40ffdcdbb7
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.env
View File

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

17
.env.example
View File

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

10
docker-compose.dev.yml
View File

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

23
docker-compose.yml
View File

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