diff --git a/.github/workflows/devel.yml b/.github/workflows/devel.yml new file mode 100644 index 0000000..cf6e36d --- /dev/null +++ b/.github/workflows/devel.yml @@ -0,0 +1,79 @@ +name: Build/push devel image + +on: + push: + branches: [devel] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-push-images: + runs-on: ubuntu-latest + strategy: + matrix: + context: ['sddi-base', 'sddi', 'sddi-social'] + fail-fast: true + max-parallel: 1 + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Github Container Registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for devel docker image + id: meta + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }} + tags: | + type=ref,enable=true,event=branch + 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-docker + + - name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel + uses: docker/build-push-action@v4 + with: + context: ${{ matrix.context }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-args: | + BASEIMAGE_VERSION=devel + + - name: Extract metadata (tags, labels) for devel-debug docker image + id: meta-debug + uses: docker/metadata-action@v4 + with: + images: | + ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }} + tags: | + type=ref,enable=true,event=branch,suffix=-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-docker + + - name: Build and publish ${{ env.REGISTRY }}/tum-gis/ckan-${{ matrix.context }}:devel-debug + uses: docker/build-push-action@v4 + with: + context: ${{ matrix.context }} + file: ${{ matrix.context }}/Dockerfile.debug + push: true + tags: ${{ steps.meta-debug.outputs.tags }} + labels: ${{ steps.meta-debug.outputs.labels }} + build-args: | + BASEIMAGE_VERSION=devel diff --git a/CHANGELOG.md b/CHANGELOG.md index bca7b58..5fd7134 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,22 +6,20 @@ 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. -## [Unreleased] - YYYY-MM-DD +## [1.0.0] - 2023-04-28 ### Added - Added *debug* images with CKAN FLASK Debug Toolbar enabled, see [here](https://github.com/tum-gis/ckan-docker#1234-image-versioning) -### Changed - -### Removed +- Added *devel* images built form latest commit to `devel` branch. +- Various docs additions. +- Added Zenodo DOI. -### Fixed - -### Security +### Changed -### Deprecated +- Various extension updates. ## [0.0.5] - 2023-03-30 @@ -99,7 +97,26 @@ for production environments.** ### Deprecated +### Known issues + +## [Unreleased] - YYYY-MM-DD + +### Added + +### Changed + +### Removed + +### Fixed + +### Security + +### Deprecated + +### Known issues + [Unreleased]: https://github.com/tum-gis/ckan-docker/compare/0.0.5...HEAD +[1.0.0]: https://github.com/tum-gis/ckan-docker/compare/0.0.5...1.0.0 [0.0.5]: https://github.com/tum-gis/ckan-docker/compare/0.0.4...0.0.5 [0.0.4]: https://github.com/tum-gis/ckan-docker/compare/0.0.3...0.0.4 [0.0.3]: https://github.com/tum-gis/ckan-docker/compare/0.0.2...0.0.3 diff --git a/README.md b/README.md index 0f70990..22b7bb1 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,12 @@ See [packages](https://github.com/orgs/tum-gis/packages?repo_name=ckan-docker) f - [:book: Configuration an documentation](#book-configuration-an-documentation) - [:hammer\_and\_wrench: Contributing](#hammer_and_wrench-contributing) - [Contributors](#contributors) + - [Github contributors to this repo](#github-contributors-to-this-repo) +- [:mortar\_board: Research](#mortar_board-research) + - [Publications](#publications) + - [Cite this repository](#cite-this-repository) - [:handshake: Thanks](#handshake-thanks) -- [:hammer\_and\_wrench: Build images](#hammer_and_wrench-build-images) +- [:memo: License](#memo-license) ## :inbox_tray: Image flavor overview @@ -89,10 +93,12 @@ The images in this repo are versioned and tagged according to the [releases](https://github.com/tum-gis/ckan-docker/releases) of this repository. The `latest` tag points to the latest release number. The `edge` version is built from the latest commit to the `main` branch of this repo. +For development purposes the `devel` images, which are build from the latest commit to the `devel` branch are published. +The `devel` images are used for testing and may contain errors. The CKAN and CKAN extension versions used for each image are listed in the table below. For development and debugging we provide a *debug* version for each image version. -These images are indicated by the `-debug` suffix on the image tag, e.g. `latest-debug` or `0.0.6-debug`. +These images are indicated by the `-debug` suffix on the image tag, e.g. `latest-debug`, `0.0.6-debug`, `edge-debug` or `devel-debug`. The debug images have the FLASK debug toolbar enabled and all required debugging dependencies installed. Read more on CKAN's debug mode in the [official docs](https://docs.ckan.org/en/latest/maintaining/configuration.html#debug). @@ -109,8 +115,8 @@ All available tags are listed in the packages of each image: ### CKAN and CKAN extension versions -CKAN version: `2.9.7` -CKAN base image: `ghcr.io/keitaroinc/ckan:2.9.7-focal` +CKAN version: `2.9.8` +CKAN base image: `ghcr.io/keitaroinc/ckan:2.9.8-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 @@ -126,15 +132,15 @@ are alway pinned to a stable release number or commit hash. | Extension | Version | `sddi-base` | `sddi` | `sddi-social` | Description | |---|---|:---:|:---:|:---:|---| -| [`scheming`](https://github.com/MarijaKnezevic/ckanext-scheming) | `0dda2be` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Configure and share CKAN dataset metadata forms. | +| [`scheming`](https://github.com/MarijaKnezevic/ckanext-scheming) | `c4f65c6` | :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) | `63289a8` | :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.0.0` | :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.0` | :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/ckan/ckanext-spatial) | `v2.0.0` | :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) | `a01061a` | :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) | `f09ed71` | :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. | +| [`spatial`](https://github.com/MarijaKnezevic/ckanext-spatial) | `d74cd14` | :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.0` | :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: | 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) | `02e7e14` | | :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. | +| [`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: | 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. | @@ -158,19 +164,143 @@ Bug fixes, issue reports and contributions are greatly appreciated. ### Contributors +[Marija Knezevic](https://www.asg.ed.tum.de/en/gis/our-team/staff/marija-knezevic/) and +[Bruno Willenborg](https://www.asg.ed.tum.de/en/gis/our-team/staff/bruno-willenborg/) +at Technical University of Munich, Chair of Geoinformatics +realized the current SDDI CKAN [Docker images](https://github.com/tum-gis/ckan-docker) +and [Helm chart](https://github.com/tum-gis/sddi-ckan-k8s) and updated the +CKAN SDDI extensions ([ckanext-grouphierarchy](https://github.com/tum-gis/ckanext-grouphierarchy-sddi), +[ckanext-relation](https://github.com/tum-gis/ckanext-relation-sddi)) initially implemented by +[Mandana Moshrefzadeh](https://www.linkedin.com/in/mandana-moshrefzadeh-a4666454) +and [Wolfgang Deigele](https://www.linkedin.com/in/wolfgang-deigele-329673189). + +The core concepts, documentation, and [initial implementation](https://github.com/tum-gis/SDDI-CKAN-Docker) +for SDDI were realized at Technical University of Munich, Chair of Geoinformatics by: + +- [Mandana Moshrefzadeh](https://www.linkedin.com/in/mandana-moshrefzadeh-a4666454): Landeshauptstadt München, Kommunalreferat – GeodatenService +- [Prof. Thomas H. Kolbe](https://www.asg.ed.tum.de/gis/unser-team/lehrstuhlangehoerige/prof-thomas-h-kolbe/): + Technical University of Munich, Chair of Geoinformatics +- [Dr. Andreas Donaubauer](https://www.asg.ed.tum.de/gis/unser-team/lehrstuhlangehoerige/dr-andreas-donaubauer/): + Technical University of Munich, Chair of Geoinformatics +- [Marija Knezevic](https://www.asg.ed.tum.de/gis/unser-team/lehrstuhlangehoerige/marija-knezevic/): + Technical University of Munich, Chair of Geoinformatics +- [Bruno Willenborg](https://www.asg.ed.tum.de/gis/unser-team/lehrstuhlangehoerige/bruno-willenborg/): + Technical University of Munich, Chair of Geoinformatics +- [Kanishk Chaturvedi](https://www.linkedin.com/in/dr-kanishk-chaturvedi), Software AG +- [Son H. Nguyen](https://www.asg.ed.tum.de/en/gis/our-team/staff/son-h-nguyen/), Technical University of Munich, Chair of Geoinformatics +- [Wolfgang Deigele](https://www.linkedin.com/in/wolfgang-deigele-329673189), ESRI Deutschland + +

+ + Technical University of Munich, Chair of Geoinformatics + +

+ +#### Github contributors to this repo + +## :mortar_board: Research + +An overview of the Smart District Data Infrastructure (SDDI) Project is available +at the Chair of Geoinformatics, Technical University of Munich +[homepage](https://www.asg.ed.tum.de/gis) +in [english](https://www.asg.ed.tum.de/en/gis/projects/smart-district-data-infrastructure/) +and [german](https://www.asg.ed.tum.de/gis/projekte/sddi/). + +### Publications + +The full list of SDDI related publications is available +[here](https://www.asg.ed.tum.de/gis/projekte/sddi/#c11942). Some key publications +are listed below: + +- [**Knezevic et al. (2022)**](https://mediatum.ub.tum.de/node?id=1689713): + *Managing Urban Digital Twins with an Extended Catalog Service*, + Proceedings of the 7th International Smart Data and Smart Cities (SDSC) Conference 2022, ISPRS Annals of Photogrammetry, Remote Sensing and Spatial Information Sciences, + [PDF download / DOI](https://doi.org/10.5194/isprs-annals-X-4-W3-2022-119-2022). + +- [**Deigele, W. et al. (2021)**](https://mediatum.ub.tum.de/node?id=1684529): + *Leitfaden – Geobasierter Digitaler Zwilling nach der SDDI-Methode*, + Ed.: Bayern Innovativ, ZD.B – Themenplattform Smart Cities and Regions. + +- [**Gackstetter, D. et al. (2021)**](https://mediatum.ub.tum.de/node?id=1636657): + *Smart Rural Areas Data Infrastructure (SRADI) – an information logistics framework for digital agriculture based on open standards*, + 41. GIL-Jahrestagung 2021 - Fokus: Informations- und Kommunikationstechnologie in kritischen Zeiten, Gesellschaft für Informatik e.V. (GI), [PDF download / DOI](https://dl.gi.de/bitstream/handle/20.500.12116/35656/GIL2021_Gackstetter_109-114.pdf?sequence=1&isAllowed=y). + +- [**Kolbe, T. H. et al. (2020)**](https://mediatum.ub.tum.de/node?id=1554725): + *The Data Integration Challenge in Smart City Projects*, + Chair of Geoinformatics, Technical University of Munich, + [PDF download / DOI](https://mediatum.ub.tum.de/doc/1554725/671062.pdf). + +- [**Moshrefzadeh, M. et al. (2020)**](https://mediatum.ub.tum.de/node?id=1540127): + *Towards a Distributed Digital Twin of the Agricultural Landscape*, + Journal of Digital Landscape Architecture (5), + [PDF download / DOI](https://gispoint.de/fileadmin/user_upload/paper_gis_open/DLA_2020/537690019.pdf). + +- [**Moshrefzadeh, M. et al. (2017)**](https://mediatum.ub.tum.de/node?id=1350813): + *Integrating and Managing the Information for Smart Sustainable Districts - The Smart District Data Infrastructure (SDDI)*, + In: Kolbe, Thomas H.; Bill, Ralf; Donaubauer, Andreas (Hrsg.): Geoinformationssysteme 2017 – Beiträge zur 4. Münchner GI-Runde. . Wichmann Verlag, + [PDF download / DOI](https://mediatum.ub.tum.de/download/1350813/1350813.pdf). + +- [**Moshrefzadeh, M. and T.H. Kolbe (2016)**](https://mediatum.ub.tum.de/node?id=1304877): + *Smart Data Infrastructure for Smart and Sustainable Cities*, + DDSS 2016, + [PDF download / DOI](https://mediatum.ub.tum.de/doc/1304877/797209.pdf). + +### Cite this repository + +To cite this repository, please use the DOI provided by [Zenodo](https://zenodo.org). +If you want to reference a specific release version of the software, click the badge +and navigate to the desired version on the page. + +[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7784078.svg?style=flat-square)](https://doi.org/10.5281/zenodo.7784078) + ## :handshake: Thanks -- This repo is based on the CKAN - [Docker images](https://github.com/keitaroinc/docker-ckan) of - [Keitaro](https://github.com/keitaroinc). Many thank's for your great work! +We would like to thank following institutions and persons for their contributions +to the SDDI concepts, tools, documentations, education, and funding: + +- [ZD.B-Themenplattform Smart Cities and Regions](https://www.bayern-innovativ.de/de/netzwerke-und-thinknet/uebersicht-digitalisierung/digitales-planen-und-bauen-smart-cities-and-regions/seite/zd-b-themenplattform-smart-cities-and-regions): + Willi Steincke at [Bayern Innovativ GmbH](https://www.bayern-innovativ.de/de?gclid=Cj0KCQjwk7ugBhDIARIsAGuvgPZkLiU4AhX1Xz-07vLIt0vpixwjF1wCrHau3PkGEMyl2ZoU_pn1hPMaAnALEALw_wcB) + und [Lutz Morich](https://www.linkedin.com/in/lutz-morich-in), for funding and supporting the SDDI development for several years. + +- [Bayerisches Staatsministerium für Digitales](https://www.stmd.bayern.de/) for funding the + [project TwinBy](https://twinby.bayern) and Stefan Bobinger for many contributions to SDDI concepts and documentation. + +- [Digital Twin Munich / Digitaler Zwilling München](https://muenchen.digital/twin/), + [Connected Urban Twins (CUT) research project](https://www.connectedurbantwins.de/en/), + [SAVeNoW research project](https://savenow.de/en/), + [eit Climate-KIC](https://www.climate-kic.org/) (SDDI research project) + for funding the work on SDDI concepts and implementation. + +- [Tome Petrovski](https://github.com/TomeCirun) :raised_hands: for professional support + with CKAN and CKAN extension development. + +- [KEITARO](https://www.keitaro.com/) for their [CKAN Docker images](https://github.com/keitaroinc/docker-ckan) + and [CKAN Helm chart](https://github.com/keitaroinc/ckan-helm) that inspired this work. + +

+ + TwinBy + +
+
+ + Bayerische Staatsministerium für Digitales + +
+
+ + Bayern Innovativ GmbH + +

-## :hammer_and_wrench: Build images +## :memo: License -- Switch to the image folder, e.g. `cd sddi-base` -- Run `./build.sh` to the image. Run `./build.sh 2.9.7` to build* using - a specific CKAN version. -- Use `./build-push.sh` to build and push the image. +This Helm chart is distributed under the Apache License 2.0. See [LICENSE](LICENSE) for more information. diff --git a/docs/img/bayernInnovativ_logo_h50.png b/docs/img/bayernInnovativ_logo_h50.png new file mode 100644 index 0000000..eee50db Binary files /dev/null and b/docs/img/bayernInnovativ_logo_h50.png differ diff --git a/docs/img/bsd_logo_h50.png b/docs/img/bsd_logo_h50.png new file mode 100644 index 0000000..0bf373f Binary files /dev/null and b/docs/img/bsd_logo_h50.png differ diff --git a/docs/img/tum_logo_h50.png b/docs/img/tum_logo_h50.png new file mode 100644 index 0000000..ba1bb0b Binary files /dev/null and b/docs/img/tum_logo_h50.png differ diff --git a/docs/img/twinBy_logo_h50.png b/docs/img/twinBy_logo_h50.png new file mode 100644 index 0000000..12d3622 Binary files /dev/null and b/docs/img/twinBy_logo_h50.png differ diff --git a/sddi-base/Dockerfile b/sddi-base/Dockerfile index 602c692..6f9d440 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="2.9-support" +ARG CKANEXT_SDDI_VERSION="1.0.0" ENV CKANEXT_SDDI_VERSION=${CKANEXT_SDDI_VERSION} RUN set -ex && \ @@ -50,7 +50,7 @@ RUN set -ex && \ ls -lah /wheels # ckanext-scheming ############################################################ -ARG CKANEXT_SCHEMING_VERSION="scheming_all_plugins" +ARG CKANEXT_SCHEMING_VERSION="c4f65c6" ENV CKANEXT_SCHEMING_VERSION=${CKANEXT_SCHEMING_VERSION} ENV CKANEXT_SCHEMING_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-scheming" @@ -59,7 +59,7 @@ RUN set -ex && \ git+${CKANEXT_SCHEMING_GITHUB_URL}.git@${CKANEXT_SCHEMING_VERSION}#egg=ckanext-scheming # ckanext datesearch ########################################################## -ARG CKANEXT_DATESEARCH_VERSION="datesearch_and_spatial" +ARG CKANEXT_DATESEARCH_VERSION="1.0.0" ENV CKANEXT_DATESEARCH_VERSION=${CKANEXT_DATESEARCH_VERSION} ENV CKANEXT_DATESEARCH_VERSION_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-datesearch" @@ -68,7 +68,7 @@ RUN set -ex && \ git+${CKANEXT_DATESEARCH_VERSION_GITHUB_URL}.git@${CKANEXT_DATESEARCH_VERSION}#egg=ckanext-datesearch # ckanext-composite ########################################################### -ARG CKANEXT_COMPOSITE_VERSION="master" +ARG CKANEXT_COMPOSITE_VERSION="1e6d7bb" ENV CKANEXT_COMPOSITE_VERSION=${CKANEXT_COMPOSITE_VERSION} ENV CKANEXT_COMPOSITE_GITHUB_URL="https://github.com/EnviDat/ckanext-composite" @@ -79,7 +79,7 @@ RUN set -ex && \ git+${CKANEXT_COMPOSITE_GITHUB_URL}.git@${CKANEXT_COMPOSITE_VERSION}#egg=ckanext-composite # ckanext-repeating ########################################################### -ARG CKANEXT_REPEATING_VERSION="master" +ARG CKANEXT_REPEATING_VERSION="1.0.0" ENV CKANEXT_REPEATING_VERSION=${CKANEXT_REPEATING_VERSION} ENV CKANEXT_REPEATING_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-repeating" @@ -90,7 +90,7 @@ RUN set -ex && \ # ckanext-spatial ############################################################# FROM ghcr.io/keitaroinc/ckan:${CKAN_VERSION_BUILD_SPATIAL} as extbuild-spatial -ARG CKANEXT_SPATIAL_VERSION="scheming-spatial" +ARG CKANEXT_SPATIAL_VERSION="d74cd14" ENV CKANEXT_SPATIAL_VERSION=${CKANEXT_SPATIAL_VERSION} USER root diff --git a/sddi/Dockerfile b/sddi/Dockerfile index 15fa69b..a867aa0 100644 --- a/sddi/Dockerfile +++ b/sddi/Dockerfile @@ -35,7 +35,7 @@ RUN set -ex && \ git+${CKANEXT_DCAT_GITHUB_URL}.git@${CKANEXT_DCAT_VERSION}#egg=ckanext-dcat # ckanext-restricted ########################################################## -ARG CKANEXT_RESTRICTED_VERSION="02e7e14" +ARG CKANEXT_RESTRICTED_VERSION="1.0.0" ENV CKANEXT_RESTRICTED_VERSION=${CKANEXT_RESTRICTED_VERSION} ENV CKANEXT_RESTRICTED_GITHUB_URL="https://github.com/MarijaKnezevic/ckanext-restricted"