From 8f25906defaf44a0c96d73c5e3ae428d9c425fcd Mon Sep 17 00:00:00 2001
From: Bruno Willenborg <b.willenborg@tum.de>
Date: Wed, 6 Sep 2023 15:03:56 +0200
Subject: [PATCH] readd composite

---
 sddi-base/Dockerfile                         | 13 ++-----------
 sddi-base/initScripts/02_ckanext-security.sh |  5 -----
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 sddi-base/initScripts/02_ckanext-security.sh

diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile
index b641f4a..3d77709 100644
--- a/sddi-base/Dockerfile
+++ b/sddi-base/Dockerfile
@@ -190,8 +190,8 @@ RUN set -ex && \
   pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-datesearch
 
 # ckanext-composite ###########################################################
-# RUN set -ex && \
-#   pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-composite
+RUN set -ex && \
+  pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-composite
 
 # ckanext-repeating ###########################################################
 RUN set -ex && \
@@ -217,13 +217,4 @@ RUN set -ex && \
   # Remove wheels
   rm -rf ${APP_DIR}/ext_wheels
 
-# Apply ckanext-security path #################################################
-# WIP: For testing, we copy this to all possible locations. First location should be sufficient.
-COPY --chown=ckan:ckan who.ini ${APP_DIR}/who.ini
-COPY --chown=ckan:ckan who.ini ${CKAN_DIR}/who.ini
-COPY --chown=ckan:ckan who.ini ${CKAN_DIR}/ckan/config/who.ini
-
-COPY --chown=ckan:ckan flask_app.py ${CKAN_DIR}/ckan/config/middleware/flask_app.py
-COPY --chown=ckan:ckan pylons_app.py ${CKAN_DIR}/ckan/config/middleware/pylons_app.py
-
 USER ckan
diff --git a/sddi-base/initScripts/02_ckanext-security.sh b/sddi-base/initScripts/02_ckanext-security.sh
deleted file mode 100644
index 2076849..0000000
--- a/sddi-base/initScripts/02_ckanext-security.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Migrate ckanext-security DB ..."
-ckan -c "${CKAN_INI}" security migrate
-echo "Migrate ckanext-security DB ...done!"