From bfab01b9f714c8fb64badefc9f20f08ec86f0e73 Mon Sep 17 00:00:00 2001
From: Brett <54408245+kowh-ai@users.noreply.github.com>
Date: Fri, 25 Sep 2020 15:26:15 +0200
Subject: [PATCH] move ckan-base/ up a level

---
 README.txt                                                     | 2 +-
 {ckan/ckan-base => ckan-base}/2.7/Dockerfile                   | 0
 {ckan/ckan-base => ckan-base}/2.7/setup/prerun.py              | 0
 {ckan/ckan-base => ckan-base}/2.7/setup/start_ckan.sh          | 0
 {ckan/ckan-base => ckan-base}/2.7/setup/supervisor.worker.conf | 0
 {ckan/ckan-base => ckan-base}/2.7/setup/supervisord.conf       | 0
 {ckan/ckan-base => ckan-base}/2.7/setup/uwsgi.conf             | 0
 {ckan/ckan-base => ckan-base}/2.8/Dockerfile                   | 0
 {ckan/ckan-base => ckan-base}/2.8/setup/prerun.py              | 0
 {ckan/ckan-base => ckan-base}/2.8/setup/start_ckan.sh          | 0
 {ckan/ckan-base => ckan-base}/2.8/setup/supervisor.worker.conf | 0
 {ckan/ckan-base => ckan-base}/2.8/setup/supervisord.conf       | 0
 {ckan/ckan-base => ckan-base}/2.8/setup/uwsgi.conf             | 0
 {ckan/ckan-base => ckan-base}/2.9/Dockerfile                   | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/ckan-uwsgi.ini         | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/prerun.py              | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/start_ckan.sh          | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/supervisor.worker.conf | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/supervisord.conf       | 0
 {ckan/ckan-base => ckan-base}/2.9/setup/wsgi.py                | 0
 20 files changed, 1 insertion(+), 1 deletion(-)
 rename {ckan/ckan-base => ckan-base}/2.7/Dockerfile (100%)
 rename {ckan/ckan-base => ckan-base}/2.7/setup/prerun.py (100%)
 rename {ckan/ckan-base => ckan-base}/2.7/setup/start_ckan.sh (100%)
 rename {ckan/ckan-base => ckan-base}/2.7/setup/supervisor.worker.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.7/setup/supervisord.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.7/setup/uwsgi.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/Dockerfile (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/setup/prerun.py (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/setup/start_ckan.sh (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/setup/supervisor.worker.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/setup/supervisord.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.8/setup/uwsgi.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/Dockerfile (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/ckan-uwsgi.ini (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/prerun.py (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/start_ckan.sh (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/supervisor.worker.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/supervisord.conf (100%)
 rename {ckan/ckan-base => ckan-base}/2.9/setup/wsgi.py (100%)

diff --git a/README.txt b/README.txt
index 1de99ae..1f9c8b4 100644
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ located at the root directory
 - 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
-- make sure the "dev" path is taken cared of with any changes
+- make sure the "development mode" path is taken cared of with any changes
 - Create an admin user during the container deployment
 
 
diff --git a/ckan/ckan-base/2.7/Dockerfile b/ckan-base/2.7/Dockerfile
similarity index 100%
rename from ckan/ckan-base/2.7/Dockerfile
rename to ckan-base/2.7/Dockerfile
diff --git a/ckan/ckan-base/2.7/setup/prerun.py b/ckan-base/2.7/setup/prerun.py
similarity index 100%
rename from ckan/ckan-base/2.7/setup/prerun.py
rename to ckan-base/2.7/setup/prerun.py
diff --git a/ckan/ckan-base/2.7/setup/start_ckan.sh b/ckan-base/2.7/setup/start_ckan.sh
similarity index 100%
rename from ckan/ckan-base/2.7/setup/start_ckan.sh
rename to ckan-base/2.7/setup/start_ckan.sh
diff --git a/ckan/ckan-base/2.7/setup/supervisor.worker.conf b/ckan-base/2.7/setup/supervisor.worker.conf
similarity index 100%
rename from ckan/ckan-base/2.7/setup/supervisor.worker.conf
rename to ckan-base/2.7/setup/supervisor.worker.conf
diff --git a/ckan/ckan-base/2.7/setup/supervisord.conf b/ckan-base/2.7/setup/supervisord.conf
similarity index 100%
rename from ckan/ckan-base/2.7/setup/supervisord.conf
rename to ckan-base/2.7/setup/supervisord.conf
diff --git a/ckan/ckan-base/2.7/setup/uwsgi.conf b/ckan-base/2.7/setup/uwsgi.conf
similarity index 100%
rename from ckan/ckan-base/2.7/setup/uwsgi.conf
rename to ckan-base/2.7/setup/uwsgi.conf
diff --git a/ckan/ckan-base/2.8/Dockerfile b/ckan-base/2.8/Dockerfile
similarity index 100%
rename from ckan/ckan-base/2.8/Dockerfile
rename to ckan-base/2.8/Dockerfile
diff --git a/ckan/ckan-base/2.8/setup/prerun.py b/ckan-base/2.8/setup/prerun.py
similarity index 100%
rename from ckan/ckan-base/2.8/setup/prerun.py
rename to ckan-base/2.8/setup/prerun.py
diff --git a/ckan/ckan-base/2.8/setup/start_ckan.sh b/ckan-base/2.8/setup/start_ckan.sh
similarity index 100%
rename from ckan/ckan-base/2.8/setup/start_ckan.sh
rename to ckan-base/2.8/setup/start_ckan.sh
diff --git a/ckan/ckan-base/2.8/setup/supervisor.worker.conf b/ckan-base/2.8/setup/supervisor.worker.conf
similarity index 100%
rename from ckan/ckan-base/2.8/setup/supervisor.worker.conf
rename to ckan-base/2.8/setup/supervisor.worker.conf
diff --git a/ckan/ckan-base/2.8/setup/supervisord.conf b/ckan-base/2.8/setup/supervisord.conf
similarity index 100%
rename from ckan/ckan-base/2.8/setup/supervisord.conf
rename to ckan-base/2.8/setup/supervisord.conf
diff --git a/ckan/ckan-base/2.8/setup/uwsgi.conf b/ckan-base/2.8/setup/uwsgi.conf
similarity index 100%
rename from ckan/ckan-base/2.8/setup/uwsgi.conf
rename to ckan-base/2.8/setup/uwsgi.conf
diff --git a/ckan/ckan-base/2.9/Dockerfile b/ckan-base/2.9/Dockerfile
similarity index 100%
rename from ckan/ckan-base/2.9/Dockerfile
rename to ckan-base/2.9/Dockerfile
diff --git a/ckan/ckan-base/2.9/setup/ckan-uwsgi.ini b/ckan-base/2.9/setup/ckan-uwsgi.ini
similarity index 100%
rename from ckan/ckan-base/2.9/setup/ckan-uwsgi.ini
rename to ckan-base/2.9/setup/ckan-uwsgi.ini
diff --git a/ckan/ckan-base/2.9/setup/prerun.py b/ckan-base/2.9/setup/prerun.py
similarity index 100%
rename from ckan/ckan-base/2.9/setup/prerun.py
rename to ckan-base/2.9/setup/prerun.py
diff --git a/ckan/ckan-base/2.9/setup/start_ckan.sh b/ckan-base/2.9/setup/start_ckan.sh
similarity index 100%
rename from ckan/ckan-base/2.9/setup/start_ckan.sh
rename to ckan-base/2.9/setup/start_ckan.sh
diff --git a/ckan/ckan-base/2.9/setup/supervisor.worker.conf b/ckan-base/2.9/setup/supervisor.worker.conf
similarity index 100%
rename from ckan/ckan-base/2.9/setup/supervisor.worker.conf
rename to ckan-base/2.9/setup/supervisor.worker.conf
diff --git a/ckan/ckan-base/2.9/setup/supervisord.conf b/ckan-base/2.9/setup/supervisord.conf
similarity index 100%
rename from ckan/ckan-base/2.9/setup/supervisord.conf
rename to ckan-base/2.9/setup/supervisord.conf
diff --git a/ckan/ckan-base/2.9/setup/wsgi.py b/ckan-base/2.9/setup/wsgi.py
similarity index 100%
rename from ckan/ckan-base/2.9/setup/wsgi.py
rename to ckan-base/2.9/setup/wsgi.py