From 0fce9defdfe985a01561b5fe3f375125352f2df9 Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 09:49:02 +0200 Subject: [PATCH 1/9] Update Dockerfile with ckanext-clamav --- sddi-base/Dockerfile | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 7936f24..2165538 100644 --- a/sddi-base/Dockerfile +++ b/sddi-base/Dockerfile @@ -87,6 +87,19 @@ RUN set -ex && \ pip wheel --wheel-dir=/wheels \ git+${CKANEXT_REPEATING_GITHUB_URL}.git@${CKANEXT_REPEATING_VERSION}#egg=ckanext-repeating +# ckanext-clamav ############################################################## +ARG CKANEXT_CALMAV_VERSION="master" +ENV CKANEXT_CALMAV_VERSION=${CKANEXT_CALMAV_VERSION} +ENV CKANEXT_CALMAV_GITHUB_URL="https://github.com/mutantsan/ckanext-clamav" + +RUN set -ex && \ + pip wheel --wheel-dir=/wheels -r \ + https://raw.githubusercontent.com/mutantsan/ckanext-clamav/${CKANEXT_CALMAV_VERSION}/requirements.txt && \ + curl -o /wheels/ckanext-clamav.txt \ + https://raw.githubusercontent.com/mutantsan/ckanext-clamav/${CKANEXT_CALMAV_VERSION}/requirements.txt && \ + pip wheel --wheel-dir=/wheels \ + git+${CKANEXT_CALMAV_GITHUB_URL}.git@${CKANEXT_CALMAV_VERSION}#egg=ckanext-clamav + # ckanext-password-policy ##################################################### ARG CKANEXT_PASSWORD_POLICY_VERSION="5618dc9" ENV CKANEXT_PASSWORD_POLICY_VERSION=${CKANEXT_PASSWORD_POLICY_VERSION} @@ -137,7 +150,7 @@ FROM ghcr.io/keitaroinc/ckan:${CKAN_VERSION_RUNTIME_STAGE} as runtime ENV CKAN__PLUGINS "image_view text_view recline_view webpage_view datastore datapusher \ hierarchy_display hierarchy_form display_group relation \ spatial_metadata spatial_query datesearch repeating composite scheming_datasets \ - password_policy \ + password_policy clamav \ envvars" # Extra env for compatibility with ckan/base Docker images for downstream k8s @@ -151,6 +164,8 @@ USER root RUN set -ex && \ apt-get update && \ apt-get install -y --no-install-recommends \ + clamav \ + clamav-daemon \ libxml2-dev libxslt1-dev libgeos-c1v5 && \ pip install --no-cache-dir -U pip && \ rm -rf /var/lib/apt/lists/* @@ -195,7 +210,12 @@ RUN set -ex && \ # ckanext-repeating ########################################################### RUN set -ex && \ pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-repeating - + +# ckanext-clamav ############################################################## +RUN set -ex && \ + pip install -r ${APP_DIR}/ext_wheels/ckanext-clamav.txt && \ + pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-clamav + # ckanext-password-policy ##################################################### RUN set -ex && \ pip install -r ${APP_DIR}/ext_wheels/ckanext-password-policy.txt && \ From e27be9501b3a67c7eefdaa079e1afeacf1eaf30d Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:04:47 +0200 Subject: [PATCH 2/9] who.timeout (user is logged out after a period of inactivity) --- sddi-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 2165538..5a8e531 100644 --- a/sddi-base/Dockerfile +++ b/sddi-base/Dockerfile @@ -239,6 +239,7 @@ RUN set -ex && \ ckan config-tool "${CKAN_INI}" "ckanext.spatial.common_map.type = custom" && \ ckan config-tool "${CKAN_INI}" "ckanext.spatial.common_map.custom.url = https://tile.openstreetmap.de/{z}/{x}/{y}.png" && \ ckan config-tool "${CKAN_INI}" "ckanext.spatial.common_map.attribution = OpenStreetMap contributors." && \ + ckan config-tool "${CKAN_INI}" "who.timeout = 1800" && \ echo "${TZ}" > /etc/timezone && \ mkdir -p ${CKAN_STORAGE_PATH} && \ chown -R ckan:ckan ${APP_DIR} ${CKAN_STORAGE_PATH} && \ From 38a27d4ca7896e6b1fe5d57a56d57879b34dce11 Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:54:24 +0200 Subject: [PATCH 3/9] Version pinning --- sddi-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 5a8e531..88f24ff 100644 --- a/sddi-base/Dockerfile +++ b/sddi-base/Dockerfile @@ -24,7 +24,7 @@ RUN set -ex && \ ls -lah /wheels # ckanext-grouphierarchy ###################################################### -ARG CKANEXT_SDDI_VERSION="1.1.3" +ARG CKANEXT_SDDI_VERSION="1.1.4" ENV CKANEXT_SDDI_VERSION=${CKANEXT_SDDI_VERSION} RUN set -ex && \ From f6e569c65326be905d98b924581fa883468c0c4a Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:04:16 +0200 Subject: [PATCH 4/9] Update CHANGELOG.md --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c00b504..ca35227 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,16 @@ 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. +## [2.0.2] - 2024-04-17 +### Added +- Variable that defines after how many seconds of user inactivity the user is logged out `who.timeout = 1800` + +### Fixed +- Various `ckanext-grouphierarchy-sddi` updates and fixing of styling bugs. See [CHANGELOG](https://github.com/tum-gis/ckanext-grouphierarchy-sddi/releases/tag/1.1.4) for changes. + - Removed "Remember me" button on the login page + - Fixing the missing variables for personalization of the main page + - Repair the view of the dataset added by the organization on the main page + ## [2.0.1] - 2023-11-07 ### Added @@ -223,6 +233,7 @@ for production environments.** ### Known issues [Unreleased]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...HEAD +[2.0.2]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2 [2.0.1]: https://github.com/tum-gis/ckan-docker/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/tum-gis/ckan-docker/compare/1.2.0...2.0.0 [1.2.0]: https://github.com/tum-gis/ckan-docker/compare/1.1.3...1.2.0 From 1383a143bd212519de60b6c23483059c74b7da83 Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:05:24 +0200 Subject: [PATCH 5/9] version pinning --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6fc531..32c2a87 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ are alway pinned to a stable release number or commit hash. |---|---|:---:|:---:|:---:|---| | [`scheming`](https://github.com/MarijaKnezevic/ckanext-scheming) | `f98daec` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Configure and share CKAN dataset metadata forms. | | [`hierarchy`](https://github.com/ckan/ckanext-hierarchy) | `v1.2.0` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Allows to organize organizations and groups in a hierarchy tree (nested groups/orgs). | -| [`grouphierarchysddi`](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) | `1.1.3` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Extends `hierarchy` with pre-defined groups and topics of the SDDI concept. | +| [`grouphierarchysddi`](https://github.com/tum-gis/ckanext-grouphierarchy-sddi) | `1.1.4` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Extends `hierarchy` with pre-defined groups and topics of the SDDI concept. | | [`relation`](https://github.com/tum-gis/ckanext-relation-sddi) | `1.0.3` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Enables to create and visualize different types of relations (*realated_to*, *depends_on*, *part_of*) between catalog entries. | | [`spatial`](https://github.com/MarijaKnezevic/ckanext-spatial) | `c2118b9` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Provides the ability to search for datasets according to a given spatial extent. | | [`datesearch`](https://github.com/MarijaKnezevic/ckanext-datesearch) | `1.0.2` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Provides the ability to search for datasets according to a given time frame. The search includes all datasets, in which the time of validity overlaps in at least one second with the search time frame. | From c6735cca4223aa4df9070d3f2737676bfbfc7e1a Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:53:09 +0200 Subject: [PATCH 6/9] Update Dockerfile with ckan.auth.public_user_details = False --- sddi-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 88f24ff..5e0614c 100644 --- a/sddi-base/Dockerfile +++ b/sddi-base/Dockerfile @@ -240,6 +240,7 @@ RUN set -ex && \ ckan config-tool "${CKAN_INI}" "ckanext.spatial.common_map.custom.url = https://tile.openstreetmap.de/{z}/{x}/{y}.png" && \ ckan config-tool "${CKAN_INI}" "ckanext.spatial.common_map.attribution = OpenStreetMap contributors." && \ ckan config-tool "${CKAN_INI}" "who.timeout = 1800" && \ + ckan config-tool "${CKAN_INI}" "ckan.auth.public_user_details = False" && \ echo "${TZ}" > /etc/timezone && \ mkdir -p ${CKAN_STORAGE_PATH} && \ chown -R ckan:ckan ${APP_DIR} ${CKAN_STORAGE_PATH} && \ From 4e64d6162df20af592516b13acf062bf93e5a6ba Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:32:52 +0200 Subject: [PATCH 7/9] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca35227..3c5b6c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ 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. -## [2.0.2] - 2024-04-17 +## [2.0.2-beta] - 2024-04-17 ### Added - Variable that defines after how many seconds of user inactivity the user is logged out `who.timeout = 1800` @@ -233,7 +233,7 @@ for production environments.** ### Known issues [Unreleased]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...HEAD -[2.0.2]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2 +[2.0.2]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2-beta [2.0.1]: https://github.com/tum-gis/ckan-docker/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/tum-gis/ckan-docker/compare/1.2.0...2.0.0 [1.2.0]: https://github.com/tum-gis/ckan-docker/compare/1.1.3...1.2.0 From a621a9e18a18ee50c8eca4e7b52ea33c502ab4a4 Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:33:58 +0200 Subject: [PATCH 8/9] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c5b6c1..b2ccc72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -233,7 +233,7 @@ for production environments.** ### Known issues [Unreleased]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...HEAD -[2.0.2]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2-beta +[2.0.2-beta]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2-beta [2.0.1]: https://github.com/tum-gis/ckan-docker/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/tum-gis/ckan-docker/compare/1.2.0...2.0.0 [1.2.0]: https://github.com/tum-gis/ckan-docker/compare/1.1.3...1.2.0 From a2ba7c58ed3f08fc9432431b703928fa222a0cf9 Mon Sep 17 00:00:00 2001 From: Marija <93824048+MarijaKnezevic@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:42:32 +0200 Subject: [PATCH 9/9] Update CHANGELOG.md --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2ccc72..743c32a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ 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. -## [2.0.2-beta] - 2024-04-17 +## [2.1.0-beta] - 2024-04-17 ### Added - Variable that defines after how many seconds of user inactivity the user is logged out `who.timeout = 1800` @@ -232,8 +232,8 @@ for production environments.** ### Known issues -[Unreleased]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...HEAD -[2.0.2-beta]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.0.2-beta +[Unreleased]: https://github.com/tum-gis/ckan-docker/compare/2.1.0...HEAD +[2.1.0-beta]: https://github.com/tum-gis/ckan-docker/compare/2.0.1...2.1.0-beta [2.0.1]: https://github.com/tum-gis/ckan-docker/compare/2.0.0...2.0.1 [2.0.0]: https://github.com/tum-gis/ckan-docker/compare/1.2.0...2.0.0 [1.2.0]: https://github.com/tum-gis/ckan-docker/compare/1.1.3...1.2.0