try ckan 2.9.9

tum-gis · Sep 6, 2023 · 6980d54 · 6980d54
1 parent e5aba6c
commit 6980d54
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile
@@ -1,9 +1,9 @@
 ###############################################################################
 # Build stage
 ###############################################################################
-ARG CKAN_VERSION_BUILD_STAGE=2.10.1-dev
-ARG CKAN_VERSION_BUILD_SPATIAL=2.10.1-dev
-ARG CKAN_VERSION_RUNTIME_STAGE=2.10.1
+ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev
+ARG CKAN_VERSION_BUILD_SPATIAL=2.9.9-dev
+ARG CKAN_VERSION_RUNTIME_STAGE=2.9.9
 
 FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild
 
@@ -68,15 +68,15 @@ RUN set -ex && \
     git+${CKANEXT_DATESEARCH_VERSION_GITHUB_URL}.git@${CKANEXT_DATESEARCH_VERSION}#egg=ckanext-datesearch
 
 # ckanext-composite ###########################################################
-# ARG CKANEXT_COMPOSITE_VERSION="1e6d7bb"
-# ENV CKANEXT_COMPOSITE_VERSION=${CKANEXT_COMPOSITE_VERSION}
-# ENV CKANEXT_COMPOSITE_GITHUB_URL="https://github.com/EnviDat/ckanext-composite"
+ARG CKANEXT_COMPOSITE_VERSION="1e6d7bb"
+ENV CKANEXT_COMPOSITE_VERSION=${CKANEXT_COMPOSITE_VERSION}
+ENV CKANEXT_COMPOSITE_GITHUB_URL="https://github.com/EnviDat/ckanext-composite"
 
-# RUN set -ex && \
-#   pip install -r \
-#     https://raw.githubusercontent.com/EnviDat/ckanext-composite/${CKANEXT_COMPOSITE_VERSION}/dev-requirements.txt && \
-#   pip wheel --wheel-dir=/wheels \
-#     git+${CKANEXT_COMPOSITE_GITHUB_URL}.git@${CKANEXT_COMPOSITE_VERSION}#egg=ckanext-composite
+RUN set -ex && \
+  pip install -r \
+    https://raw.githubusercontent.com/EnviDat/ckanext-composite/${CKANEXT_COMPOSITE_VERSION}/dev-requirements.txt && \
+  pip wheel --wheel-dir=/wheels \
+    git+${CKANEXT_COMPOSITE_GITHUB_URL}.git@${CKANEXT_COMPOSITE_VERSION}#egg=ckanext-composite
 
 # ckanext-repeating ###########################################################
 ARG CKANEXT_REPEATING_VERSION="1.0.0"
@@ -132,7 +132,7 @@ FROM ckan/ckan-base:${CKAN_VERSION_RUNTIME_STAGE} as runtime
 
 ENV CKAN__PLUGINS "image_view text_view recline_view datastore datapusher \
   hierarchy_display hierarchy_form display_group relation \
-  spatial_metadata spatial_query datesearch repeating scheming_datasets \
+  spatial_metadata spatial_query datesearch repeating composite scheming_datasets \
   envvars"
 
 # Extra env for compatibility with ckan/base Docker images for downstream k8s
@@ -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 && \
@@ -208,7 +208,7 @@ RUN set -ex && \
   ckan config-tool "${CKAN_INI}" "ckan.spatial.srid = 4326" && \
   ckan config-tool "${CKAN_INI}" "ckanext.spatial.search_backend = solr-bbox" && \
   ckan config-tool "${CKAN_INI}" "scheming.dataset_schemas = ckanext.scheming:ckan_dataset.yaml" && \
-  ckan config-tool "${CKAN_INI}" "scheming.presets = ckanext.scheming:presets.json ckanext.repeating:presets.json" && \
+  ckan config-tool "${CKAN_INI}" "scheming.presets = ckanext.scheming:presets.json ckanext.repeating:presets.json ckanext.composite:presets.json" && \
   ckan config-tool "${CKAN_INI}" "scheming.dataset_fallback = false" && \
   ckan config-tool "${CKAN_INI}" "licenses_group_url = https://raw.githubusercontent.com/tum-gis/ckanext-grouphierarchy-sddi/main/ckanext/grouphierarchy/licenses_SDDI.json" && \
   echo "${TZ}" > /etc/timezone && \

diff --git a/sddi-base/Dockerfile.debug b/sddi-base/Dockerfile.debug
@@ -3,7 +3,7 @@ ARG BASEIMAGE_VERSION=edge
 
 FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
 
-ARG CKAN_VERSION=2.10.1
+ARG CKAN_VERSION=2.9.9
 ENV CKAN_VERSION=${CKAN_VERSION}
 
 USER root

diff --git a/sddi-social/Dockerfile b/sddi-social/Dockerfile
@@ -3,7 +3,7 @@
 # #############################################################################
 ARG BASEIMAGE_REPOSITORY=ghcr.io/tum-gis/ckan-sddi
 ARG BASEIMAGE_VERSION=latest
-ARG CKAN_VERSION_BUILD_STAGE=2.10.1-dev
+ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev
 
 FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild
 
@@ -28,7 +28,7 @@ USER root
 
 ENV CKAN__PLUGINS "image_view text_view recline_view datastore datapusher \
   hierarchy_display hierarchy_form display_group relation \
-  spatial_metadata spatial_query datesearch repeating scheming_datasets \
+  spatial_metadata spatial_query datesearch repeating composite scheming_datasets \
   resource_proxy geo_view geojson_view wmts_view shp_view \
   dcat dcat_json_interface structured_data \
   restricted \

diff --git a/sddi-social/Dockerfile.debug b/sddi-social/Dockerfile.debug
@@ -3,7 +3,7 @@ ARG BASEIMAGE_VERSION=edge
 
 FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
 
-ARG CKAN_VERSION=2.10.1
+ARG CKAN_VERSION=2.9.9
 ENV CKAN_VERSION=${CKAN_VERSION}
 
 USER root

diff --git a/sddi/Dockerfile b/sddi/Dockerfile
@@ -3,7 +3,7 @@
 # #############################################################################
 ARG BASEIMAGE_REPOSITORY=ghcr.io/tum-gis/ckan-sddi-base
 ARG BASEIMAGE_VERSION=latest
-ARG CKAN_VERSION_BUILD_STAGE=2.10.1-dev
+ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev
 
 FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild
 
@@ -54,7 +54,7 @@ USER root
 
 ENV CKAN__PLUGINS "image_view text_view recline_view datastore datapusher \
   hierarchy_display hierarchy_form display_group relation \
-  spatial_metadata spatial_query datesearch repeating scheming_datasets \
+  spatial_metadata spatial_query datesearch repeating composite scheming_datasets \
   resource_proxy geo_view geojson_view wmts_view shp_view \
   dcat dcat_json_interface structured_data \
   restricted \

diff --git a/sddi/Dockerfile.debug b/sddi/Dockerfile.debug
@@ -3,7 +3,7 @@ ARG BASEIMAGE_VERSION=edge
 
 FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}
 
-ARG CKAN_VERSION=2.10.1
+ARG CKAN_VERSION=2.9.9
 ENV CKAN_VERSION=${CKAN_VERSION}
 
 USER root