Skip to content

Commit

Permalink
readd composite
Browse files Browse the repository at this point in the history
  • Loading branch information
@BWibo
BWibo committed Sep 6, 2023
1 parent 61d7bed commit 8f25906
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
13 changes: 2 additions & 11 deletions sddi-base/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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
5 changes: 0 additions & 5 deletions sddi-base/initScripts/02_ckanext-security.sh
View file

This file was deleted.

0 comments on commit 8f25906

Please sign in to comment.