From 82ad95a0dd9e9996f98d0f0d0b7cd717974bad4c Mon Sep 17 00:00:00 2001
From: Brett <brett@kowh.ai>
Date: Fri, 18 Feb 2022 14:23:08 +0100
Subject: [PATCH] Consolidate the COPY commands

---
 images/ckan-base/2.7/Dockerfile | 8 +++-----
 images/ckan-base/2.8/Dockerfile | 8 +++-----
 images/ckan-base/2.9/Dockerfile | 9 +++------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/images/ckan-base/2.7/Dockerfile b/images/ckan-base/2.7/Dockerfile
index 83b33c9..0904522 100755
--- a/images/ckan-base/2.7/Dockerfile
+++ b/images/ckan-base/2.7/Dockerfile
@@ -81,11 +81,9 @@ RUN addgroup -g 92 -S ckan && \
 RUN mkdir -p $CKAN_STORAGE_PATH && \
     chown -R ckan:ckan $CKAN_STORAGE_PATH
 
-COPY 2.7/setup/ckan-uwsgi.ini ${APP_DIR}
-COPY 2.7/setup/wsgi.py ${APP_DIR}
-COPY 2.7/setup/prerun.py ${APP_DIR}
-COPY 2.7/setup/start_ckan.sh ${APP_DIR}
-COPY 2.7/setup/supervisord.conf /etc/supervisord.conf
+# Copy setup files
+COPY 2.7/setup ${APP_DIR}
+RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
 
 # Create entrypoint directory for children image scripts
 ONBUILD RUN mkdir /docker-entrypoint.d
diff --git a/images/ckan-base/2.8/Dockerfile b/images/ckan-base/2.8/Dockerfile
index e2cec51..09d8806 100755
--- a/images/ckan-base/2.8/Dockerfile
+++ b/images/ckan-base/2.8/Dockerfile
@@ -79,11 +79,9 @@ RUN addgroup -g 92 -S ckan && \
 RUN mkdir -p $CKAN_STORAGE_PATH && \
     chown -R ckan:ckan $CKAN_STORAGE_PATH
 
-COPY 2.8/setup/ckan-uwsgi.ini ${APP_DIR}
-COPY 2.8/setup/wsgi.py ${APP_DIR}
-COPY 2.8/setup/prerun.py ${APP_DIR}
-COPY 2.8/setup/start_ckan.sh ${APP_DIR}
-COPY 2.8/setup/supervisord.conf /etc/supervisord.conf
+# Copy setup files
+COPY 2.8/setup ${APP_DIR}
+RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
 
 # Create entrypoint directory for children image scripts
 ONBUILD RUN mkdir /docker-entrypoint.d
diff --git a/images/ckan-base/2.9/Dockerfile b/images/ckan-base/2.9/Dockerfile
index a0d28d4..7879774 100755
--- a/images/ckan-base/2.9/Dockerfile
+++ b/images/ckan-base/2.9/Dockerfile
@@ -79,12 +79,9 @@ RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
 RUN pip3 install supervisor && \
 mkdir /etc/supervisord.d
 
-# Copy all setup files
-COPY 2.9/setup/ckan-uwsgi.ini ${APP_DIR}
-COPY 2.9/setup/wsgi.py ${APP_DIR}
-COPY 2.9/setup/prerun.py ${APP_DIR}
-COPY 2.9/setup/start_ckan.sh ${APP_DIR}
-COPY 2.9/setup/supervisord.conf /etc/supervisord.conf
+# Copy setup files
+COPY 2.9/setup ${APP_DIR}
+RUN mv ${APP_DIR}/supervisord.conf /etc/supervisord.conf
 
 # Create a local user and group to run the app
 RUN addgroup -g 92 -S ckan && \