From dc12a53f76e0815c84f34af25a0b0a4c501c951c Mon Sep 17 00:00:00 2001 From: Brett Date: Thu, 19 Jan 2023 13:34:17 +0100 Subject: [PATCH] Update .env --- .env | 4 ++++ .env.template | 4 ++++ docker-compose.dev.yml | 7 ++----- docker-compose.yml | 7 ++----- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.env b/.env index 60cb4ac..02d6238 100644 --- a/.env +++ b/.env @@ -33,6 +33,10 @@ CKAN_SITE_ID=default CKAN_SITE_URL=http://ckan:5000 CKAN_PORT=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_PASSWORD=test1234 CKAN_SYSADMIN_EMAIL=your_email@example.com diff --git a/.env.template b/.env.template index 60cb4ac..02d6238 100644 --- a/.env.template +++ b/.env.template @@ -33,6 +33,10 @@ CKAN_SITE_ID=default CKAN_SITE_URL=http://ckan:5000 CKAN_PORT=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_PASSWORD=test1234 CKAN_SYSADMIN_EMAIL=your_email@example.com diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 309ebbc..2b6a0f1 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,8 +1,6 @@ version: "3" volumes: - ckan_config: - ckan_home: ckan_storage: pg_data: solr_data: @@ -27,10 +25,7 @@ services: condition: service_healthy ports: - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" - volumes: - - ckan_config:/etc/ckan - - ckan_home:/usr/lib/ckan - ckan_storage:/var/lib/ckan - ./src:/srv/app/src_extensions restart: unless-stopped @@ -64,6 +59,8 @@ services: solr: container_name: ${SOLR_CONTAINER_NAME} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} + volumes: + - solr_data:/var/solr restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"] diff --git a/docker-compose.yml b/docker-compose.yml index 2fe75f2..8548f0e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ version: "3" volumes: - ckan_config: - ckan_home: ckan_storage: pg_data: solr_data: @@ -39,10 +37,7 @@ services: condition: service_healthy ports: - "0.0.0.0:${CKAN_PORT_HOST}:${CKAN_PORT}" - volumes: - - ckan_config:/etc/ckan - - ckan_home:/usr/lib/ckan - ckan_storage:/var/lib/ckan restart: unless-stopped healthcheck: @@ -75,6 +70,8 @@ services: solr: container_name: ${SOLR_CONTAINER_NAME} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} + volumes: + - solr_data:/var/solr restart: unless-stopped healthcheck: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"]