From 368a060a5e9368321b52870d10abe684e3bad156 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 13 Mar 2020 20:19:26 +0100
Subject: [PATCH] Make CKAN SPOC-compatible, cont'd.

---
 lxc-apps/ckan/app                   | 8 ++++----
 lxc-apps/ckan/ckan-datapusher.image | 4 ++--
 lxc-apps/ckan/ckan.image            | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lxc-apps/ckan/app b/lxc-apps/ckan/app
index 75b9539..8dd76be 100644
--- a/lxc-apps/ckan/app
+++ b/lxc-apps/ckan/app
@@ -21,27 +21,27 @@
             }
         },
         "ckan-datapusher": {
-            "image": "ckan-datapusher_0.0.13-190620",
+            "image": "ckan-datapusher_0.0.15-200313",
             "mounts": {
                 "ckan/datapusher_conf": "etc/ckan-datapusher",
                 "ckan/datapusher_data": "srv/ckan-datapusher/data"
             }
         },
         "ckan-redis": {
-            "image": "redis_4.0.12-190620",
+            "image": "redis_5.0.7-200313",
             "mounts": {
                 "ckan/redis_conf/redis.conf": "etc/redis.conf:file",
                 "ckan/redis_data": "var/lib/redis"
             }
         },
         "ckan-solr": {
-            "image": "solr6_6.5.1-190620",
+            "image": "solr6_6.5.1-200313",
             "mounts": {
                 "ckan/solr_data": "var/lib/solr"
             }
         },
         "ckan-postgres": {
-            "image": "postgis_2.5.1-190620",
+            "image": "postgis_3.0.0-200313",
             "mounts": {
                 "ckan/postgres_data": "var/lib/postgresql"
             }
diff --git a/lxc-apps/ckan/ckan-datapusher.image b/lxc-apps/ckan/ckan-datapusher.image
index 9fd74f5..da337a4 100644
--- a/lxc-apps/ckan/ckan-datapusher.image
+++ b/lxc-apps/ckan/ckan-datapusher.image
@@ -1,4 +1,4 @@
-IMAGE ckan-datapusher_0.0.13-190620
+IMAGE ckan-datapusher_0.0.15-200313
 FROM alpine3.11-python2.7_2.7.16-200313
 
 RUN EOF
@@ -12,7 +12,7 @@ RUN EOF
     mkdir -p /srv/ckan-datapusher
     cd /srv/ckan-datapusher
     pip install -U setuptools
-    pip install -e 'git+https://github.com/ckan/datapusher.git#egg=datapusher'
+    pip install -e 'git+https://github.com/ckan/datapusher.git@3926f14a5fd2143cfa005eede6588b35c4a07513#egg=datapusher'
 
     # Create OS user
     addgroup -S -g 8080 ckandp
diff --git a/lxc-apps/ckan/ckan.image b/lxc-apps/ckan/ckan.image
index e761a74..22bfb99 100644
--- a/lxc-apps/ckan/ckan.image
+++ b/lxc-apps/ckan/ckan.image
@@ -14,7 +14,7 @@ RUN EOF
     pip install -U setuptools
     pip install flask-debugtoolbar
     pip install -e 'git+https://github.com/ckan/ckan.git@8e1cc60b2fa11da6843051678b7ee2cc08c2a7a9#egg=ckan'
-    pip install -r /srv/ckan/src/ckan/requirements-py2.txt
+    pip install -r /srv/ckan/src/ckan/requirements.txt
 
     # Install CKAN extensions
     pip install -e 'git+https://github.com/ckan/ckanext-basiccharts#egg=ckanext_basiccharts'