pr sddi-urban-2.9.9-pr

.github/workflows/devel.yml

@@ -7,6 +7,7 @@ on:
       - sddi-base/**
       - sddi/**
       - sddi-social/**
+      - sddi-urban/**
 
 env:
   REGISTRY: ghcr.io
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        context: ['sddi-base', 'sddi', 'sddi-social']
+        context: ['sddi-base', 'sddi', 'sddi-social', 'sddi-urban']
       fail-fast: true
       max-parallel: 1
     permissions:

.github/workflows/edge.yml

@@ -7,6 +7,7 @@ on:
       - sddi-base/**
       - sddi/**
       - sddi-social/**
+      - sddi-urban/**
 
 env:
   REGISTRY: ghcr.io
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        context: ['sddi-base', 'sddi', 'sddi-social']
+        context: ['sddi-base', 'sddi', 'sddi-social', 'sddi-urban']
       fail-fast: true
       max-parallel: 1
     permissions:

.github/workflows/pull-request.yml

@@ -6,6 +6,7 @@ on:
       - sddi-base/**
       - sddi/**
       - sddi-social/**
+      - sddi-urban/**
 
 env:
   REGISTRY: ghcr.io
@@ -223,3 +224,66 @@ jobs:
         run: |
           echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-social-pr-${{github.event.number}}-debug"
           echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-social-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}-debug"
+
+      # SDDI-URBAN
+      -
+        name: Extract metadata (tags, labels) for docker image
+        id: meta-sddi-urban
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev
+          tags: |
+            type=ref,event=pr,prefix=sddi-urban-pr-
+            type=ref,event=pr,prefix=sddi-urban-pr-,suffix=-{{sha}}
+          labels: |
+            maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
+            org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
+            org.opencontainers.image.title=ckan-sddi-urban-docker-dev
+      -
+        name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: sddi-urban
+          tags: ${{ steps.meta-sddi-urban.outputs.tags }}
+          labels: ${{ steps.meta-sddi-urban.outputs.labels }}
+          build-args: |
+            BASEIMAGE_REPOSITORY=${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev
+            BASEIMAGE_VERSION=sddi-base-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}
+      -
+        name: Print image names
+        run: |
+          echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}"
+          echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}"
+      -
+        name: Extract metadata (tags, labels) for docker image
+        id: meta-sddi-urban-debug
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev
+          tags: |
+            type=ref,event=pr,prefix=sddi-urban-pr-,suffix=-debug
+            type=ref,event=pr,prefix=sddi-urban-pr-,suffix=-{{sha}}-debug
+          labels: |
+            maintainer=Chair of Geoinformatics, Technical University of Munich (TUM)
+            org.opencontainers.image.vendor=Chair of Geoinformatics, Technical University of Munich (TUM)
+            org.opencontainers.image.title=ckan-sddi-urban-docker-dev-debug
+      -
+        name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}-debug
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          context: sddi-urban
+          file: sddi-urban/Dockerfile.debug
+          tags: ${{ steps.meta-sddi-urban-debug.outputs.tags }}
+          labels: ${{ steps.meta-sddi-urban-debug.outputs.labels }}
+          build-args: |
+            BASEIMAGE_REPOSITORY=${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev
+            BASEIMAGE_VERSION=sddi-base-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}
+      -
+        name: Print image names
+        run: |
+          echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}-debug"
+          echo "${{ env.REGISTRY }}/tum-gis/ckan-sddi-dev:sddi-urban-pr-${{github.event.number}}-${{ steps.short-sha.outputs.sha }}-debug"

.github/workflows/release.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        context: ['sddi-base', 'sddi', 'sddi-social']
+        context: ['sddi-base', 'sddi', 'sddi-social', 'sddi-urban']
       fail-fast: true
       max-parallel: 1
     permissions:

README.md

@@ -104,6 +104,23 @@ for moderation of social media content.
 ghcr.io/tum-gis/ckan-sddi-social
 ```
 
+<<<<<<< HEAD
+=======
+### `sddi-urban`
+
+`sddi-base` + some CKAN extensions for extended data and resource preview and description options,
+extended import-/ export, harvesting, and security support. Some extensions from `sddi-base`
+are installed but deactivated. These could be easily reactivated by including them into the
+plugin list in ckan configuration.
+This image also includes a slightly different set of preinstalled SDDI groups and topics as
+well as the option of custom theming and a custom metadata schema, inspired by the requirements
+of Landeshauptstadt München (LHM).
+
+```text
+ghcr.io/tum-gis/ckan-sddi-urban
+```
+
+>>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
 ## :1234: Image versioning
 
 The images in this repo are versioned and tagged according to the
@@ -177,6 +194,7 @@ are alway pinned to a stable release number or commit hash.
 > **Note:** Version pinning is only applied for release versions. The `edge`
 > image may depend on upstream branches instead.
 
+<<<<<<< HEAD
 | Extension | Version | `sddi-base` | `sddi` | `sddi-social` | Description |
 |---|---|:---:|:---:|:---:|---|
 | [`scheming`](https://github.com/MarijaKnezevic/ckanext-scheming) | `f98daec` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Configure and share CKAN dataset metadata forms. |
@@ -192,6 +210,29 @@ are alway pinned to a stable release number or commit hash.
 | [`geoview`](https://github.com/ckan/ckanext-geoview) | `v0.0.20` |  | :heavy_check_mark: | :heavy_check_mark: | This extension contains view plugins to display geospatial files and services in CKAN. |
 | [`disqus`](https://github.com/ckan/ckanext-disqus) |  |  |  | :heavy_check_mark: | The Disqus extension allows site visitors to comment on individual packages using an AJAX-based commenting system. The downsides of this plugin are that comments are not stored locally and user information is not shared between CKAN and the commenting system. |
 | [`password_policy`](https://github.com/keitaroinc/ckanext-password-policy) | `5618dc9`|:heavy_check_mark:  |:heavy_check_mark:| :heavy_check_mark: | CKAN extension that adds password policy for all the users. |
+=======
+| Extension | Version | `sddi-base` | `sddi` | `sddi-social` | `sddi-urban` | Description |
+|---|---|:---:|:---:|:---:|:---:|---|
+| [`scheming`](https://github.com/MarijaKnezevic/ckanext-scheming), [`scheming (sddi-urban)`](https://github.com/gislab-augsburg/ckanext-scheming) | `f98daec`, `a7fdd9c`| :heavy_check_mark: | :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: | :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. |
+| [`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: | :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. |
+| [`repeating`](https://github.com/MarijaKnezevic/ckanext-repeating) | `1.0.0` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |  | This extension provides a way to store repeating fields in CKAN datasets, resources, organizations and groups. |
+| [`composite`](https://github.com/EnviDat/ckanext-composite) | `1e6d7bb` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | The extension allows to store structured dataset metadata, single or multiple fields. Only one level of subfields is possible. The subfields can be basic text, date type or dropboxes. |
+| [`restricted`](https://github.com/MarijaKnezevic/ckanext-restricted) | `1.0.0` |  | :heavy_check_mark: | :heavy_check_mark: |  | CKAN extension to restrict the accessibility to the resources of a dataset. This way the package metadata is accesible but not the data itself (resource). The resource access restriction level can be individualy defined for every package. |
+| [`dcat`](https://github.com/ckan/ckanext-dcat) | `v1.4.0` |  | :heavy_check_mark: | :heavy_check_mark: |  | Allow CKAN to expose and consume metadata from other catalogs using RDF documents serialized using DCAT. |
+| [`geoview`](https://github.com/ckan/ckanext-geoview) | `v0.0.20` |  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | This extension contains view plugins to display geospatial files and services in CKAN. |
+| [`disqus`](https://github.com/ckan/ckanext-disqus) |  |  |  | :heavy_check_mark: |  | The Disqus extension allows site visitors to comment on individual packages using an AJAX-based commenting system. The downsides of this plugin are that comments are not stored locally and user information is not shared between CKAN and the commenting system. |
+| [`password_policy`](https://github.com/keitaroinc/ckanext-password-policy) | `5618dc9`|:heavy_check_mark:  |:heavy_check_mark:| :heavy_check_mark: | :heavy_check_mark: | CKAN extension that adds password policy for all the users. |
+| [`resourcedictionary`](https://github.com/keitaroinc/ckanext-resourcedictionary) | `v1.0.0` |  |  |  | :heavy_check_mark: | Extends the default CKAN Data Dictionary functionality by adding possibility to create data dictionary before actual data is uploaded to datastore.  |
+| [`xloader`](https://github.com/ckan/ckanext-xloader) | `1.0.1` |  |  |  | :heavy_check_mark: | Provides a faster and more robust way to load data into CKAN's DataStore. |
+| [`lhm`](https://github.com/MandanaMoshref/ckanext-lhm) | `cca4bcb` |  |  |  | :heavy_check_mark: | Adds options for a custom metadata schema, custom theming and an adapted set of groups and topics, provided by Landeshauptstadt München (LHM).  |
+| [`harvest`](https://github.com/ckan/ckanext-harvest) | `v1.5.6` |  |  |  | :heavy_check_mark: | Provides a framework and management tools for automatic harvesting of other metatdata catalogs. |
+| [`qgov`](https://github.com/qld-gov-au/ckanext-qgov) | `6.0.2` |  |  |  | :heavy_check_mark: | Adds extended security and GDPR features. |
+
+>>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
 
 ## :rocket: Usage
 

build-noCache.sh

@@ -60,3 +60,23 @@ docker build . \
 
 cd ..
 printf "\n\n"
+
+# sddi-urban ########################################################################
+cd ../sddi-urban
+
+# sddi-urban:TAG
+docker build . \
+  --no-cache \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}"
+
+# sddi:TAG-debug
+docker build . \
+  --no-cache \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}-debug"
+
+printf "\n\n"
+

build-push-noCache.sh

@@ -70,3 +70,25 @@ docker push "$IMAGE_REPOSITORY/ckan-sddi-social:${IMAGE_TAG}-debug"
 
 cd ..
 printf "\n\n"
+
+# sddi-urban ########################################################################
+cd ../sddi
+
+# sddi-urban:TAG
+docker build . \
+  --no-cache \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}"
+
+docker push "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}"
+
+# sddi-urban:TAG-debug
+docker build . \
+  --no-cache \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}-debug"
+
+docker push "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}-debug"
+printf "\n\n"

build-push.sh

@@ -64,3 +64,24 @@ docker push "$IMAGE_REPOSITORY/ckan-sddi-social:${IMAGE_TAG}-debug"
 
 cd ..
 printf "\n\n"
+
+# sddi ########################################################################
+cd ../sddi-urban
+
+# sddi:TAG
+docker build . \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}"
+
+docker push "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}"
+
+# sddi:TAG-debug
+docker build . \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
+  -t "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}-debug"
+
+docker push "$IMAGE_REPOSITORY/ckan-sddi-urban:${IMAGE_TAG}-debug"
+printf "\n\n"
+

build.sh

@@ -54,3 +54,21 @@ docker build . \
 
 cd ..
 printf "\n\n"
+
+# sddi-urban ########################################################################
+cd ../sddi-urban
+
+# sddi:TAG
+docker build . \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG} \
+  -t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}"
+
+# sddi:TAG-debug
+docker build . \
+  --build-arg "BASEIMAGE_REPOSITORY=$IMAGE_REPOSITORY/ckan-sddi-base" \
+  --build-arg BASEIMAGE_VERSION=${IMAGE_TAG}-debug \
+  -t "$IMAGE_REPOSITORY/ckan-sddi:${IMAGE_TAG}-debug"
+
+printf "\n\n"
+

sddi-urban/Dockerfile

@@ -73,7 +73,11 @@ RUN set -ex && \
     git+${CKANEXT_XLOADER_GITHUB_URL}.git@${CKANEXT_XLOADER_VERSION}#egg=ckanext-xloader
 
 # ckanext-lhm ##########################################################
+<<<<<<< HEAD
 ARG CKANEXT_LHM_VERSION="c7cbea7"
+=======
+ARG CKANEXT_LHM_VERSION="cca4bcb"
+>>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
 ENV CKANEXT_LHM_VERSION=${CKANEXT_LHM_VERSION}
 ENV CKANEXT_LHM_GITHUB_URL="https://github.com/MandanaMoshref/ckanext-lhm"
 
@@ -247,9 +251,12 @@ RUN set -ex && \
   rm -rf ${APP_DIR}/ext_wheels && \
   # Remove init script
   rm -f ${APP_DIR}/docker-afterinit.d/01_create_groups.sh
+<<<<<<< HEAD
 
 # Set timezone
 ENV TZ="Europe/Berlin"
 RUN echo "${TZ}" > /etc/timezone
+=======
+>>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
 
 USER ckan

sddi-urban/Dockerfile.debug

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 ARG BASEIMAGE_REPOSITORY=ghcr.io/it-at-m/ckan-sddi-urban
 ARG BASEIMAGE_VERSION=edge-2.9.9-dev
+=======
+ARG BASEIMAGE_REPOSITORY=ghcr.io/tum-gis/ckan-sddi-urban
+ARG BASEIMAGE_VERSION=edge-2.9.9
+>>>>>>> b3519d32a68b10f164e74aa129fef24d0ab4cabe
 
 FROM ${BASEIMAGE_REPOSITORY}:${BASEIMAGE_VERSION}