From 29fd51e46683f7e20959d521ca433adc8e0e3ad3 Mon Sep 17 00:00:00 2001
From: Brett <54408245+kowh-ai@users.noreply.github.com>
Date: Thu, 13 May 2021 08:34:14 +0200
Subject: [PATCH] More updates

---
 README.txt          | 2 +-
 ckan/Dockerfile     | 6 ++++--
 ckan/Dockerfile.dev | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index 7bb4931..90e45fd 100644
--- a/README.txt
+++ b/README.txt
@@ -10,7 +10,7 @@ located at the root directory
 - should there be a datapusher image pre-built like ckan? maybe an xloader image?
 
 
-Difference between ckan-base and ckan-dev
+### Difference between ckan-base and ckan-dev ###
 
 ckan-base
 docker-compose up -d --build
diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index d9fbcf3..eabaeaa 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -2,7 +2,9 @@ FROM ckan/ckan-base:testing-only.2.9
 
 LABEL maintainer="brett@kowh.ai"
 
-# Set timezone
+
+# Set up environment variables
+ENV APP_DIR=/srv/app
 ENV TZ=UTC
 RUN echo ${TZ} > /etc/timezone
 
@@ -26,7 +28,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
 # See https://github.com/okfn/docker-ckan#applying-patches
 COPY patches ${APP_DIR}/patches
 
-RUN for d in $APP_DIR/patches/*; do \
+RUN for d in ${APP_DIR}/patches/*; do \
         if [ -d $d ]; then \
             for f in `ls $d/*.patch | sort -g`; do \
                 cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev
index 5903c9c..e16ff3b 100644
--- a/ckan/Dockerfile.dev
+++ b/ckan/Dockerfile.dev
@@ -2,7 +2,8 @@ FROM ckan/ckan-dev:testing-only.2.9
 
 LABEL maintainer="brett@kowh.ai"
 
-# Set timezone
+# Set up environment variables
+ENV APP_DIR=/srv/app
 ENV TZ=UTC
 RUN echo ${TZ} > /etc/timezone
 
@@ -26,7 +27,7 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
 # See https://github.com/okfn/docker-ckan#applying-patches
 COPY patches ${APP_DIR}/patches
 
-RUN for d in $APP_DIR/patches/*; do \
+RUN for d in ${APP_DIR}/patches/*; do \
         if [ -d $d ]; then \
             for f in `ls $d/*.patch | sort -g`; do \
                 cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \