From 08c10f2dc600ee0eeff503766830c4d4c2b6adcd Mon Sep 17 00:00:00 2001 From: Blagoja Stojkoski Date: Thu, 18 Feb 2021 14:36:39 +0100 Subject: [PATCH] fixes resource replace upload (#41) * fixes resource replace upload * Add rust and cargo in order to build cryptography Co-authored-by: Marko Bocevski --- .../patches/01_patch_resource_replace_upload.patch | 11 +++++++++++ images/datapusher/Dockerfile | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 images/ckan/2.9/patches/01_patch_resource_replace_upload.patch diff --git a/images/ckan/2.9/patches/01_patch_resource_replace_upload.patch b/images/ckan/2.9/patches/01_patch_resource_replace_upload.patch new file mode 100644 index 0000000..3f11fac --- /dev/null +++ b/images/ckan/2.9/patches/01_patch_resource_replace_upload.patch @@ -0,0 +1,11 @@ +--- ckan/ckan/logic/action/update.py 2021-02-17 16:46:55.673578728 +0100 ++++ ckan/ckan/logic/action/update-edit.py 2021-02-17 16:47:28.905879170 +0100 +@@ -929,7 +929,7 @@ + + ''' + model = context['model'] +- session = model.Session ++ session = model.meta.create_local_session() + context['session'] = session + + user = context['user'] diff --git a/images/datapusher/Dockerfile b/images/datapusher/Dockerfile index 3385d40..4894864 100644 --- a/images/datapusher/Dockerfile +++ b/images/datapusher/Dockerfile @@ -33,7 +33,9 @@ RUN apk add --no-cache \ libffi-dev \ openssl-dev \ libxml2-dev \ - libxslt-dev + libxslt-dev \ + rust \ + cargo # Create the src directory RUN mkdir -p ${SRC_DIR}