From 1491d1ab257e6527081b778e3336e648028634fd Mon Sep 17 00:00:00 2001
From: Brett <54408245+kowh-ai@users.noreply.github.com>
Date: Thu, 17 Sep 2020 14:02:02 +0200
Subject: [PATCH] more updates

---
 .env       | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.txt | 28 ++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 .env

diff --git a/.env b/.env
new file mode 100644
index 0000000..95fc9e9
--- /dev/null
+++ b/.env
@@ -0,0 +1,55 @@
+# DB image settings
+# POSTGRES_USER must be set to the database user used by CKAN, typically named ckan
+# Readwrite user/pass will be POSTGRES_USER:POSTGRES_PASSWORD
+POSTGRES_USER=ckan
+POSTGRES_PASSWORD=ckan
+# Readonly user/pass will be DATASTORE_READONLY_USER:DATASTORE_READONLY_PASSWORD
+DATASTORE_READONLY_USER=datastore_ro
+DATASTORE_READONLY_PASSWORD=datastore
+# POSTGRES_HOST must be set to the host for the postgres server.
+# As a default 'db' will point to the postgres running in the docker container specified by the docker-compose.yml file.
+POSTGRES_HOST=db
+
+# Basic
+CKAN_SITE_ID=default
+CKAN_SITE_URL=http://ckan:5000
+CKAN_PORT=5000
+CKAN_SYSADMIN_NAME=ckan_admin
+CKAN_SYSADMIN_PASSWORD=test1234
+CKAN_SYSADMIN_EMAIL=your_email@example.com
+TZ=UTC
+
+# Database connections (TODO: avoid duplication)
+CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
+CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
+CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
+
+# Test database connections
+#TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
+TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
+TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
+
+# Other services connections
+CKAN_SOLR_URL=http://solr:8983/solr/ckan
+CKAN_REDIS_URL=redis://redis:6379/1
+CKAN_DATAPUSHER_URL=http://datapusher:8801
+CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
+
+TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
+TEST_CKAN_REDIS_URL=redis://redis:6379/1
+
+# Core settings
+CKAN__STORAGE_PATH=/var/lib/ckan
+CKAN_SMTP_SERVER=smtp.corporateict.domain:25
+CKAN_SMTP_STARTTLS=True
+CKAN_SMTP_USER=user
+CKAN_SMTP_PASSWORD=pass
+CKAN_SMTP_MAIL_FROM=ckan@localhost
+
+# Extensions
+
+CKAN__PLUGINS=envvars image_view text_view recline_view datastore datapusher
+CKAN__HARVEST__MQ__TYPE=redis
+CKAN__HARVEST__MQ__HOSTNAME=redis
+CKAN__HARVEST__MQ__PORT=6379
+CKAN__HARVEST__MQ__REDIS_DB=1
\ No newline at end of file
diff --git a/README.txt b/README.txt
index 36d5c6d..ce5626c 100644
--- a/README.txt
+++ b/README.txt
@@ -1,2 +1,28 @@
 ### Please note that this re-purposed CKAN Docker repo is a WORK IN PROGRESS ###
-### It should not be used to install CKAN via Docker until this page is updated ###
\ No newline at end of file
+### It should not be used to install CKAN via Docker until this page is updated ###
+
+
+Potential ideas/investigations from Keitaro (Marko Bocevski) : https://github.com/keitaroinc/docker-ckan:
+
+- Maybe use build/up time variables loaded via the .env file, runtime variables loaded via a .ckan-env file - both
+located at the root directory
+- Should we use wheels too? 
+- 2 networks: 1) Frontend 2) Backend
+- Create/access a CKAN datapusher image rather than use keitaro/base:0.4
+- all username/passwords as environment variables rather than hardcoded
+- "/images" is a good folder name to use to be able to build all versions of CKAN and DataPusher images
+- include an examples folder for examples of adding extentions xloader, harvester, etc
+
+
+Helpful Notes:
+
+Build ckan-base image (2.9)
+cd /path/to/ckan-docker/ckan/ckan-base
+docker build -t kowhai/ckan-base:2.9 -f 2.9/Dockerfile .
+ 
+Login to Dockerhub
+docker login --username=kowhai 
+(will then ask for a password)
+
+Push image to Dockerhub
+docker push kowhai/ckan-base:2.9
\ No newline at end of file