June 2025 upgrade of EPOS-MSL

Author: stsnel

docker/images/ckan/Dockerfile

@@ -59,7 +59,7 @@ ENV CKAN_STORAGE_PATH=/ckanstorage
 ENV CKAN_VERSION=2.11.0
 ENV CKAN_SCHEMING_VERSION=release-3.0.0
 ENV CKAN_SPATIAL_VERSION=v2.2.0
-ENV CKAN_MSL_CORE_VERSION=1.5.0
+ENV CKAN_MSL_CORE_VERSION=1.6.0
 ENV CKAN_MSL_UTIL_VERSION=1.1.0
 
 # Create storage path

docker/images/ckan/ckan.ini

@@ -126,6 +126,8 @@ ckan.redis.url = redis://redis:6379/0
 #ckan.plugins = stats text_view image_view recline_view
 ckan.plugins = stats text_view image_view msl_ckan scheming_datasets scheming_groups scheming_organizations msl_custom_facets msl_repeating_fields spatial_metadata spatial_query
 
+ckanext.spatial.search_backend=solr-spatial-field
+
 scheming.dataset_schemas = ckanext.msl_ckan:schemas/datasets/data_publication.yml ckanext.msl_ckan:schemas/datasets/labs.json ckanext.msl_ckan:schemas/datasets/equipment.json
 scheming.organization_schemas = ckanext.msl_ckan:schemas/organizations/organization.json
 

docker/images/msl-api/Dockerfile

@@ -7,6 +7,10 @@ LABEL org.opencontainers.image.authors="Yoda team"
 # Need bash to get nvm/npm to work with default init files
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# Settings
+
+ENV MSL_API_VERSION=1.6.0
+
 # Set timezone
 ENV TZ=UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -69,8 +73,10 @@ ADD msl-api-entrypoint.sh /msl-api-entrypoint.sh
 RUN chmod +x /msl-api-entrypoint.sh
 
 RUN cd /var/www && \
-    git clone https://github.com/utrechtUniversity/msl_api --branch development && \
-    chown -R www-data:www-data msl_api
+    git clone https://github.com/utrechtUniversity/msl_api &&  \
+    cd msl_api && \
+    git checkout "$MSL_API_VERSION" && \
+    chown -R www-data:www-data .
 USER www-data
 ADD msl-api.env /var/www/msl_api/.env
 ADD supervisord.conf /var/www/msl-api-supervisord.conf

docker/images/solr/Dockerfile

@@ -4,7 +4,7 @@ FROM solr:8.11
 LABEL org.opencontainers.image.authors="Yoda team"
 
 ENV SOLR_CONFIG_DIR="/opt/solr/server/solr/configsets"
-ENV MSL_CKAN_CORE_VERSION=1.5.0
+ENV MSL_CKAN_CORE_VERSION=1.6.0
 
 # Create a CKAN configset based on the default one
 USER root