diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f11682e..40c2169 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -149,7 +149,7 @@ jobs: run: | echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}-debug" - # SDDI + # SDDI-SOCIAL - name: Extract metadata (tags, labels) for docker image id: meta-sddi-social diff --git a/CHANGELOG.md b/CHANGELOG.md index ce67f32..7520b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). For releases `< 1.0.0` minor version steps may indicate breaking changes too. +## [1.2.0] - 2023-08-21 + +### Changed + +- Update to CKAN `2.9.9` + +### Fixed + ## [1.1.3] - 2023-08-03 ### Fixed -- upstream bugfix from [ckanext-grouphierarchy-sddi](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) extension tum-gis/ckanext-grouphierarchy-sddi#17 - - Default filter "read" for searching datasets by Main Categories/Topics is removed. -- [Extended licenses list](https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/licenses_SDDI.json) required for SDDI is added in upstream repo [ckanext-grouphierarchy-sddi](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) +- Upstream bugfix from [ckanext-grouphierarchy-sddi](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) extension tum-gis/ckanext-grouphierarchy-sddi#17 + - Default filter "read" for searching datasets by Main Categories/Topics is removed. +- [Extended licenses list](https://github.com/tum-gis/ckanext-grouphierarchy-sddi/blob/main/ckanext/grouphierarchy/licenses_SDDI.json) required for SDDI is added in upstream repo [ckanext-grouphierarchy-sddi](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) ## [1.1.2] - 2023-07-24 diff --git a/README.md b/README.md index 82b14aa..9ea1d58 100644 --- a/README.md +++ b/README.md @@ -152,8 +152,8 @@ This registry will be cleared periodically. ### CKAN and CKAN extension versions -CKAN version: `2.9.8` -CKAN base image: `ghcr.io/keitaroinc/ckan:2.9.8-focal` +CKAN version: `2.9.9` +CKAN base image: `ghcr.io/keitaroinc/ckan:2.9.9-focal` The CKAN catalog platform uses several extensions to provide the functionality needed for the SDDI concept. The table below lists the included extensions with diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 429efb5..57f0e71 100644 --- a/sddi-base/Dockerfile +++ b/sddi-base/Dockerfile @@ -1,9 +1,9 @@ ############################################################################### # Build stage ############################################################################### -ARG CKAN_VERSION_BUILD_STAGE=2.9.8-dev -ARG CKAN_VERSION_BUILD_SPATIAL=2.9.8-focal -ARG CKAN_VERSION_RUNTIME_STAGE=2.9.8-focal +ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev +ARG CKAN_VERSION_BUILD_SPATIAL=2.9.9-focal +ARG CKAN_VERSION_RUNTIME_STAGE=2.9.9-focal FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild diff --git a/sddi-base/Dockerfile.debug b/sddi-base/Dockerfile.debug index 0ca860b..92b661d 100644 --- 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.9.8 +ARG CKAN_VERSION=2.9.9 ENV CKAN_VERSION=${CKAN_VERSION} USER root diff --git a/sddi-social/Dockerfile b/sddi-social/Dockerfile index 7c7a779..3d3a8c6 100644 --- 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.9.8-dev +ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild diff --git a/sddi-social/Dockerfile.debug b/sddi-social/Dockerfile.debug index c94948c..935e716 100644 --- 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.9.8 +ARG CKAN_VERSION=2.9.9 ENV CKAN_VERSION=${CKAN_VERSION} USER root diff --git a/sddi/Dockerfile b/sddi/Dockerfile index b054b44..69e444a 100644 --- 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.9.8-dev +ARG CKAN_VERSION_BUILD_STAGE=2.9.9-dev FROM ckan/ckan-base:${CKAN_VERSION_BUILD_STAGE} as extbuild diff --git a/sddi/Dockerfile.debug b/sddi/Dockerfile.debug index 67acb1a..c38d975 100644 --- 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.9.8 +ARG CKAN_VERSION=2.9.9 ENV CKAN_VERSION=${CKAN_VERSION} USER root