From 2c9427d1770c60c454cbf3f10196f55046b5c5cd Mon Sep 17 00:00:00 2001
From: Brett <brett@kowh.ai>
Date: Sat, 26 Nov 2022 14:15:06 +0100
Subject: [PATCH] Update for dev-v2.10

---
 .env                  |  2 +-
 ckan/Dockerfile       |  2 +-
 datapusher/Dockerfile | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index cc0c2ac..548f3f7 100644
--- a/.env
+++ b/.env
@@ -55,7 +55,7 @@ CKAN_REDIS_URL=redis://redis:6379/1
 TEST_CKAN_REDIS_URL=redis://redis:6379/1
 
 # Datapusher
-DATAPUSHER_VERSION=0.0.17
+DATAPUSHER_VERSION=0.0.18
 CKAN_DATAPUSHER_URL=http://datapusher:8800
 CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
 DATAPUSHER_REWRITE_RESOURCES=True
diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index 2d70857..72cc138 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -1,4 +1,4 @@
-FROM ckan/ckan-base:master-4a43842
+FROM ckan/ckan-base:dev-v2.10
 #FROM ckan/ckan-base:2.9.7
 
 # Set up environment variables
diff --git a/datapusher/Dockerfile b/datapusher/Dockerfile
index 3fc0271..2222f14 100755
--- a/datapusher/Dockerfile
+++ b/datapusher/Dockerfile
@@ -34,14 +34,8 @@ RUN apk add --no-cache \
 RUN mkdir ${APP_DIR}/src && cd ${APP_DIR}/src && \
     git clone -b ${GIT_BRANCH} --depth=1 --single-branch ${GIT_URL} && \
     cd datapusher && \
-    python3 setup.py install
-
-## Need an custom version of requirements.txt  (with an old release of Werkzeug)
-
-COPY setup/requirements.txt ${APP_DIR}/src/
-    
-RUN  cd ${APP_DIR}/src && \ 
-     pip3 install --no-cache-dir -r requirements.txt
+    python3 setup.py install && \
+    pip3 install --no-cache-dir -r requirements.txt
 
 RUN apk del .build-deps && \
     cp ${APP_DIR}/src/datapusher/deployment/*.* ${APP_DIR} && \