Merge pull request #177 from vrk-kpa/REKDAT-119_ckan-2.10.4

REKDAT-119: CKAN 2.10.4

ckan/Dockerfile

@@ -84,7 +84,7 @@ RUN \
   mkdir -p ${DATA_DIR} && \
   # Install CKAN and requirements
   pip install --find-links=/srv/app/wheels -r ${SRC_DIR}/ckan-requirements.txt && \
-  pip install -e git+https://github.com/ckan/ckan.git@ckan-2.10.3#egg=ckan && \
+  pip install -e git+https://github.com/ckan/ckan.git@ckan-2.10.4#egg=ckan && \
   # Configure environment
   addgroup -g 92 ckan && \
   adduser -u 92 -h ${APP_DIR} -H -D -G ckan ckan && \
@@ -158,8 +158,7 @@ COPY src/ckan/ckan-uwsgi.ini ${APP_DIR}
 
 # apply patches
 RUN cd ${SRC_DIR}/ckan && \
-    patch --strip=1 --input=patches/remove-ckan-fontawesome.patch && \
-    patch --strip=1 --input=patches/remove_extra_head.patch
+    patch --strip=1 --input=patches/remove-ckan-fontawesome.patch
 
 RUN \
   # Make scripts executable

ckan/ckan-requirements.in

@@ -1,7 +1,7 @@
 # This file defines the used CKAN version and any overrides
 # Compile with pip-compile to produce the ckan-requirements.txt used in build
 
-ckan[requirements] @ git+https://github.com/ckan/ckan.git@ckan-2.10.3
+ckan[requirements] @ git+https://github.com/ckan/ckan.git@ckan-2.10.4
 
 # Runtime requirements
 uWSGI==2.0.22

ckan/ckan-requirements.txt

@@ -27,7 +27,7 @@ charset-normalizer==2.0.12
     #   ckan
     #   requests
 # Removed manually for installing editable separately
-# ckan[requirements] @ git+https://github.com/ckan/ckan.git@ckan-2.10.3
+# ckan[requirements] @ git+https://github.com/ckan/ckan.git@ckan-2.10.4
     # via -r ckan-requirements.in
 click==8.1.3
     # via
@@ -167,7 +167,6 @@ sqlalchemy[mypy]==1.4.41
     # via
     #   alembic
     #   ckan
-    #   sqlalchemy
 sqlalchemy2-stubs==0.0.2a27
     # via
     #   ckan
@@ -210,7 +209,6 @@ werkzeug[watchdog]==2.0.3
     #   ckan
     #   flask
     #   flask-login
-    #   werkzeug
 wrapt==1.14.0
     # via
     #   ckan