add ckanext-keycloak

it-at-m · Jul 10, 2024 · 2a9c8b8 · 2a9c8b8
1 parent d787240
commit 2a9c8b8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/.github/workflows/edge-sddi-urban.yml b/.github/workflows/edge-sddi-urban.yml
@@ -2,7 +2,7 @@ name: Build/push edge-2.9.9 image
 
 on:
   push:
-    branches: [sddi-urban-2.9.9]
+    branches: [dev]
     paths:
       - sddi-urban/**
 
@@ -39,10 +39,8 @@ 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.5
+            type=raw,value=udp-katalog-1.1.6-dev
           labels: |
             maintainer=it@m, Landeshauptstadt Muenchen (LHM)
             org.opencontainers.image.vendor=it@m, Landeshauptstadt Muenchen (LHM)
@@ -65,8 +63,7 @@ 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.5-debug
+            type=raw,value=udp-katalog-1.1.6-debug-dev
           labels: |
             maintainer=it@m, Landeshauptstadt Muenchen (LHM)
             org.opencontainers.image.vendor=it@m, Landeshauptstadt Muenchen (LHM)

diff --git a/sddi-urban/Dockerfile b/sddi-urban/Dockerfile
@@ -134,17 +134,17 @@ RUN set -ex && \
     git+${CKANEXT_ISO_GITHUB_URL}.git@${CKANEXT_ISO_VERSION}#egg=ckanext-iso
 
 ## ckanext-keycloak ##########################################################
-#ARG CKANEXT_KEYCLOAK_VERSION="v2.1"
-#ENV CKANEXT_KEYCLOAK_VERSION=${CKANEXT_KEYCLOAK_VERSION}
-#ENV CKANEXT_KEYCLOAK_GITHUB_URL="https://github.com/keitaroinc/ckanext-keycloak"
-#
-#RUN set -ex && \
-#  pip install -r \
-#    https://raw.githubusercontent.com/keitaroinc/ckanext-keycloak/${CKANEXT_KEYCLOAK_VERSION}/requirements.txt && \
-#  curl -o /wheels/ckanext-keycloak.txt \
-#    https://raw.githubusercontent.com/keitaroinc/ckanext-keycloak/${CKANEXT_KEYCLOAK_VERSION}/requirements.txt && \
-#  pip wheel --wheel-dir=/wheels \
-#    git+${CKANEXT_KEYCLOAK_GITHUB_URL}.git@${CKANEXT_KEYCLOAK_VERSION}#egg=ckanext-keycloak
+ARG CKANEXT_KEYCLOAK_VERSION="v2.1"
+ENV CKANEXT_KEYCLOAK_VERSION=${CKANEXT_KEYCLOAK_VERSION}
+ENV CKANEXT_KEYCLOAK_GITHUB_URL="https://github.com/keitaroinc/ckanext-keycloak"
+
+RUN set -ex && \
+  pip install -r \
+    https://raw.githubusercontent.com/keitaroinc/ckanext-keycloak/${CKANEXT_KEYCLOAK_VERSION}/requirements.txt && \
+  curl -o /wheels/ckanext-keycloak.txt \
+    https://raw.githubusercontent.com/keitaroinc/ckanext-keycloak/${CKANEXT_KEYCLOAK_VERSION}/requirements.txt && \
+  pip wheel --wheel-dir=/wheels \
+    git+${CKANEXT_KEYCLOAK_GITHUB_URL}.git@${CKANEXT_KEYCLOAK_VERSION}#egg=ckanext-keycloak
 
 # ckanext-noanonaccess ##########################################################
 ARG CKANEXT_NOANONACCESS_VERSION="v2.0.4"
@@ -225,9 +225,9 @@ RUN set -ex && \
   pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-iso
 
 ## ckanext-keycloak #################################################################
-#RUN set -ex && \
-#  pip install -r ${APP_DIR}/ext_wheels/ckanext-keycloak.txt && \
-#  pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-keycloak
+RUN set -ex && \
+  pip install -r ${APP_DIR}/ext_wheels/ckanext-keycloak.txt && \
+  pip install --no-index --find-links=${APP_DIR}/ext_wheels ckanext-keycloak
 
 # ckanext-noanonaccess #############################################################
 RUN set -ex && \