use ckanext-glab gdpr instead of ckanext-qgov

it-at-m · Jan 18, 2024 · b16dcd8 · b16dcd8
1 parent ae5fa2d
commit b16dcd8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/edge-sddi-urban.yml b/.github/workflows/edge-sddi-urban.yml
@@ -39,10 +39,9 @@ jobs:
         with:
           images: |
             ${{ env.REGISTRY }}/it-at-m/ckan-${{ matrix.context }}
-          flavor: latest=true
           tags: |
-            type=edge,branch=sddi-urban-2.9.9,suffix=-2.9.9
-            type=raw,value=udp-katalog-1.1.1
+            type=edge,branch=sddi-urban-2.9.9,suffix=-2.9.9-dev
+            type=raw,value=udp-katalog-1.2.0-dev
           labels: |
             maintainer=it@m, Landeshauptstadt Muenchen (LHM)
             org.opencontainers.image.vendor=it@m, Landeshauptstadt Muenchen (LHM)
@@ -65,8 +64,8 @@ jobs:
           images: |
             ${{ env.REGISTRY }}/it-at-m/ckan-${{ matrix.context }}
           tags: |
-            type=edge,branch=sddi-urban-2.9.9,suffix=-2.9.9-debug
-            type=raw,value=udp-katalog-1.1.1-debug
+            type=edge,branch=sddi-urban-2.9.9,suffix=-2.9.9-debug-dev
+            type=raw,value=udp-katalog-1.2.0-debug-dev
           labels: |
             maintainer=it@m, Landeshauptstadt Muenchen (LHM)
             org.opencontainers.image.vendor=it@m, Landeshauptstadt Muenchen (LHM)

diff --git a/README.md b/README.md
@@ -213,7 +213,7 @@ are alway pinned to a stable release number or commit hash.
 | [`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. |
+| [`glab`](https://github.com/gislab-augsburg/ckanext-glab/tree/gdpr) | `0612d22` |  |  |  | :heavy_check_mark: | Adds extended security and GDPR features. |
 
 
 ## :rocket: Usage

diff --git a/sddi-urban/Dockerfile b/sddi-urban/Dockerfile
@@ -111,18 +111,14 @@ RUN set -ex && \
   pip wheel --wheel-dir=/wheels \
     git+${CKANEXT_SCHEMING_GITHUB_URL}.git@${CKANEXT_SCHEMING_VERSION}#egg=ckanext-scheming
 
-# ckanext-qgov ##########################################################
-ARG CKANEXT_QGOV_VERSION="6.0.2"
-ENV CKANEXT_QGOV_VERSION=${CKANEXT_QGOV_VERSION}
-ENV CKANEXT_QGOV_GITHUB_URL="https://github.com/qld-gov-au/ckanext-qgov"
+# ckanext-glab ##########################################################
+ARG CKANEXT_GLAB_VERSION="0612d22"
+ENV CKANEXT_GLAB_VERSION=${CKANEXT_GLAB_VERSION}
+ENV CKANEXT_GLAB_GITHUB_URL="https://github.com/gislab-augsburg/ckanext-glab"
 
 RUN set -ex && \
-  pip install -r \
-    https://raw.githubusercontent.com/qld-gov-au/ckanext-qgov/${CKANEXT_QGOV_VERSION}/requirements.txt && \
-  curl -o /wheels/ckanext-qgov.txt \
-    https://raw.githubusercontent.com/qld-gov-au/ckanext-qgov/${CKANEXT_QGOV_VERSION}/requirements.txt && \
   pip wheel --wheel-dir=/wheels \
-    git+${CKANEXT_QGOV_GITHUB_URL}.git@${CKANEXT_QGOV_VERSION}#egg=ckanext-qgov
+    git+${CKANEXT_GLAB_GITHUB_URL}.git@${CKANEXT_GLAB_VERSION}#egg=ckanext-glab
 
 
 # #############################################################################
@@ -139,7 +135,7 @@ ENV CKAN__PLUGINS "image_view text_view recline_view webpage_view \
     resourcedictionary datastore xloader hierarchy_group_form \
     password_policy resource_proxy geo_view geojson_view wmts_view shp_view \
     harvest ckan_harvester csw_harvester waf_harvester doc_harvester \
-    qgovext envvars"
+    gdpr envvars"
 
 # Copy python wheels from build stage
 COPY --from=extbuild /wheels ${APP_DIR}/ext_wheels
@@ -185,10 +181,9 @@ RUN yes | pip uninstall ckanext-scheming
 RUN set -ex && \
   pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-scheming
 
-# ckanext-qgov #############################################################
+# ckanext-glab #############################################################
 RUN set -ex && \
-  pip install -r ${APP_DIR}/ext_wheels/ckanext-qgov.txt && \
-  pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-qgov
+  pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-glab
 
 
 RUN set -ex && \