From 0b84974ed549f11634a2949f3a657c3b14ae5e8d Mon Sep 17 00:00:00 2001
From: Brett <54408245+kowh-ai@users.noreply.github.com>
Date: Wed, 12 May 2021 16:25:03 +0200
Subject: [PATCH] Update

---
 README.txt          | 38 +++++++++++++++-----------------------
 ckan/Dockerfile     |  2 +-
 ckan/Dockerfile.dev | 10 +++++++---
 ckan/patches        |  0
 4 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 ckan/patches

diff --git a/README.txt b/README.txt
index cd856bd..7bb4931 100644
--- a/README.txt
+++ b/README.txt
@@ -1,32 +1,24 @@
 ### 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 ###
 
-
-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
-
 - Look at using ghcr.io (GitHub Packages) to store Docker Images rather than DockerHub
-
-- Should we use wheels too?
-
-- Use Multi Stage Docker builds? 
-    run some tests on image/container size with the different options
-    a smaller production build vs a development build with all the dev tools
-
-- Use SSL on the NGINX container port
-
-- 2 networks: 1) Frontend 2) Backend
-
-- Create/access a CKAN datapusher image rather than build one?
-
 - 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
-
-- make sure the "development mode" path is taken cared of with any changes
-
+- make sure the "development mode" path is taken cared of with any change
 - Create an admin user during the container deployment
+- should there be a datapusher image pre-built like ckan? maybe an xloader image?
+
+
+Difference between ckan-base and ckan-dev
+
+ckan-base
+docker-compose up -d --build
+docker-compose build
+docker-compose up
+
+ckan-dev
+docker-compose -f docker-compose.dev.yml up -d --build
+docker-compose -f docker-compose.dev.yml build
+docker-compose -f docker-compose.dev.yml up
 
-- should there be a datapusher container built? maybe an xloader container?
diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index b0fbad9..d9fbcf3 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="brett@kowh.ai"
 
 # Set timezone
 ENV TZ=UTC
-RUN echo $TZ > /etc/timezone
+RUN echo ${TZ} > /etc/timezone
 
 # Make sure both files are not exactly the same
 RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev
index 972701d..5903c9c 100644
--- a/ckan/Dockerfile.dev
+++ b/ckan/Dockerfile.dev
@@ -3,9 +3,13 @@ FROM ckan/ckan-dev:testing-only.2.9
 LABEL maintainer="brett@kowh.ai"
 
 # Set timezone
-ARG TZ
-RUN cp /usr/share/zoneinfo/$TZ /etc/localtime
-RUN echo $TZ > /etc/timezone
+ENV TZ=UTC
+RUN echo ${TZ} > /etc/timezone
+
+# Make sure both files are not exactly the same
+RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
+        cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
+    fi ;
 
 # Install any extensions needed by your CKAN instance
 # (Make sure to add the plugins to CKAN__PLUGINS in the .env file)
diff --git a/ckan/patches b/ckan/patches
deleted file mode 100644
index e69de29..0000000