From bb48c03341de6113634ab6d91d38784c5faddef3 Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Wed, 22 Mar 2023 09:54:02 +0000
Subject: [PATCH] Update Dockerfile.dev - Use stable 2.9.7 - Add plugins

---
 ckan/Dockerfile.dev | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/ckan/Dockerfile.dev b/ckan/Dockerfile.dev
index 5098db1..a4f79c6 100644
--- a/ckan/Dockerfile.dev
+++ b/ckan/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM ckan/ckan-base:ckan-2.10.0-dev
+FROM ckan/ckan-base:2.9.7-dev
 
 # Set up environment variables
 ENV APP_DIR=/srv/app
@@ -11,7 +11,7 @@ RUN apk add geos-dev proj proj-util proj-dev
 
 # Make sure both files are not exactly the same
 RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
-        cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
+    cp /usr/share/zoneinfo/${TZ} /etc/localtime ;\
     fi ;
 
 # Install any extensions needed by your CKAN instance
@@ -31,9 +31,9 @@ RUN if ! [ /usr/share/zoneinfo/${TZ} -ef /etc/localtime ]; then \
 
 
 ###TODO: XLoader ###
-#RUN pip3 install -e 'git+https://github.com/ckan/ckanext-xloader.git@master#egg=ckanext-xloader' && \ 
-#    pip3 install -r ${APP_DIR}/src/ckanext-xloader/requirements.txt && \
-#    pip3 install -U requests[security]
+RUN pip3 install -e 'git+https://github.com/ckan/ckanext-xloader.git@master#egg=ckanext-xloader' && \ 
+    pip3 install -r ${APP_DIR}/src/ckanext-xloader/requirements.txt && \
+    pip3 install -U requests[security]
 
 ### Harvester ###
 RUN echo "ckan/ckanext-harvester" && \
@@ -58,12 +58,7 @@ RUN echo "ckan/ckanext-spatial" && \
 
 ### Scheming-GeoDCAT-AP extended version ###
 RUN echo "mjanez/ckanext-scheming (GeoDCAT-AP extended version)" && \
-    pip3 install -e git+https://github.com/mjanez/ckanext-scheming.git#egg=ckanext-scheming  && \
-        # update CKAN config with ckanext-scheming parameters
-        ckan config-tool ${CKAN_INI} "scheming.dataset_schemas=''" && \
-        ckan config-tool ${CKAN_INI} "scheming.group_schemas=''" && \
-        ckan config-tool ${CKAN_INI} "scheming.organization_schemas=''" && \
-        ckan config-tool ${CKAN_INI} "scheming.presets=''"
+    pip3 install -e git+https://github.com/mjanez/ckanext-scheming.git#egg=ckanext-scheming 
 
 ### Pages ###
 RUN echo "ckan/ckanext-pages" && \
@@ -78,6 +73,16 @@ RUN echo "mjanez/ckanext-dcat (GeoDCAT-AP extended version)" && \
     pip3 install -e git+https://github.com/mjanez/ckanext-dcat.git#egg=ckanext-dcat && \
     pip3 install -r https://raw.githubusercontent.com/mjanez/ckanext-dcat/master/requirements.txt
 
+###TODO: ckanext-visualize
+#https://github.com/keitaroinc/ckanext-visualize
+
+###TODO datapreview error
+# 2023-03-19 12:54:42,311 WARNI [ckan.lib.datapreview] Plugin for view t could not be found
+# 2023-03-19 12:54:42,313 WARNI [ckan.lib.datapreview] Plugin for view e could not be found
+# 2023-03-19 12:54:42,314 WARNI [ckan.lib.datapreview] Plugin for view x could not be found
+# 2023-03-19 12:54:42,315 WARNI [ckan.lib.datapreview] Plugin for view t could not be found
+# https://github.com/ckan/ckan/search?q=datapreview&type=issues
+
 # ###TODO: SPARQL Interface - Adapt to Py3###
 # RUN echo "mjanez/sparql (Fixed version)" && \
 #     pip3 install -e git+https://github.com/mjanez/ckanext-sparql.git#egg=ckanext-sparql  && \
@@ -97,9 +102,9 @@ COPY docker-entrypoint.d/* /docker-entrypoint.d/
 COPY patches ${APP_DIR}/patches
 
 RUN for d in $APP_DIR/patches/*; do \
-        if [ -d $d ]; then \
-            for f in `ls $d/*.patch | sort -g`; do \
-                cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
-            done ; \
-        fi ; \
+    if [ -d $d ]; then \
+    for f in `ls $d/*.patch | sort -g`; do \
+    cd $SRC_DIR/`basename "$d"` && echo "$0: Applying patch $f to $SRC_DIR/`basename $d`"; patch -p1 < "$f" ; \
+    done ; \
+    fi ; \
     done
\ No newline at end of file