gitea/ckan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #37 from ckan/beaker-env-var-plus-docker-compose-tidyup

Browse Source 
Updates to .env files (secrets) and docker-compose.yml
This commit is contained in:
Brett Jones 2023-01-20 14:53:40 +01:00 committed by GitHub
commit 1279b16423
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env
View File

@ -33,6 +33,10 @@ CKAN_SITE_ID=default
CKAN_SITE_URL=http://ckan:5000 CKAN_SITE_URL=http://ckan:5000
CKAN_PORT=5000 CKAN_PORT=5000
CKAN_PORT_HOST=5000 CKAN_PORT_HOST=5000
CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
# See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings
CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME
CKAN___API_TOKEN__JWT__DECODE__SECRET=string:CHANGE_ME
CKAN_SYSADMIN_NAME=ckan_admin CKAN_SYSADMIN_NAME=ckan_admin
CKAN_SYSADMIN_PASSWORD=test1234 CKAN_SYSADMIN_PASSWORD=test1234
CKAN_SYSADMIN_EMAIL=your_email@example.com CKAN_SYSADMIN_EMAIL=your_email@example.com

4
.env.template
View File

@ -33,6 +33,10 @@ CKAN_SITE_ID=default
CKAN_SITE_URL=http://ckan:5000 CKAN_SITE_URL=http://ckan:5000
CKAN_PORT=5000 CKAN_PORT=5000
CKAN_PORT_HOST=5000 CKAN_PORT_HOST=5000
CKAN___BEAKER__SESSION__SECRET=CHANGE_ME
# See https://docs.ckan.org/en/latest/maintaining/configuration.html#api-token-settings
CKAN___API_TOKEN__JWT__ENCODE__SECRET=string:CHANGE_ME
CKAN___API_TOKEN__JWT__DECODE__SECRET=string:CHANGE_ME
CKAN_SYSADMIN_NAME=ckan_admin CKAN_SYSADMIN_NAME=ckan_admin
CKAN_SYSADMIN_PASSWORD=test1234 CKAN_SYSADMIN_PASSWORD=test1234
CKAN_SYSADMIN_EMAIL=your_email@example.com CKAN_SYSADMIN_EMAIL=your_email@example.com

7
docker-compose.dev.yml
View File

@ -1,8 +1,6 @@
version: "3" version: "3"
volumes: volumes:
ckan_config:
ckan_home:
ckan_storage: ckan_storage:
pg_data: pg_data:
solr_data: solr_data:
@ -27,10 +25,7 @@ services:
condition: service_healthy condition: service_healthy
ports: ports:
- "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}"
volumes: volumes:
- ckan_config:/etc/ckan
- ckan_home:/usr/lib/ckan
- ckan_storage:/var/lib/ckan - ckan_storage:/var/lib/ckan
- ./src:/srv/app/src_extensions - ./src:/srv/app/src_extensions
restart: unless-stopped restart: unless-stopped
@ -64,6 +59,8 @@ services:
solr: solr:
container_name: ${SOLR_CONTAINER_NAME} container_name: ${SOLR_CONTAINER_NAME}
image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
volumes:
- solr_data:/var/solr
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"] test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"]

7
docker-compose.yml
View File

@ -1,8 +1,6 @@
version: "3" version: "3"
volumes: volumes:
ckan_config:
ckan_home:
ckan_storage: ckan_storage:
pg_data: pg_data:
solr_data: solr_data:
@ -39,10 +37,7 @@ services:
condition: service_healthy condition: service_healthy
ports: ports:
- "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}"
volumes: volumes:
- ckan_config:/etc/ckan
- ckan_home:/usr/lib/ckan
- ckan_storage:/var/lib/ckan - ckan_storage:/var/lib/ckan
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
@ -75,6 +70,8 @@ services:
solr: solr:
container_name: ${SOLR_CONTAINER_NAME} container_name: ${SOLR_CONTAINER_NAME}
image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION}
volumes:
- solr_data:/var/solr
restart: unless-stopped restart: unless-stopped
healthcheck: healthcheck:
test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"] test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"]