fix(image): add missing openapi-merge-cli executable (#526)

GluuFederation · Oct 20, 2022 · c14b1f4 · c14b1f4
1 parent 5798ee9
commit c14b1f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -7,7 +7,7 @@ RUN apk update \
 # TODO:
 # - use NODE_ENV=production
 # - download build package (not git clone)
-ENV ADMIN_UI_VERSION=224001fe4ef0c9d0a16e4a2af02e34c93ebe0443
+ENV ADMIN_UI_VERSION=5798ee9f6320602d756cb2d33fe297200d2231dd
 
 # note that as we're pulling from a monorepo (with multiple project in it)
 # we are using partial-clone and sparse-checkout to get the admin-ui code
@@ -20,6 +20,7 @@ RUN git clone --filter blob:none --no-checkout https://github.com/GluuFederation
     && mv /tmp/flex/admin-ui /opt/flex/admin-ui \
     && cd /opt/flex/admin-ui \
     && npm install @openapitools/openapi-generator-cli \
+    && npm install openapi-merge-cli \
     && npm run api \
     && npm install \
     && npm uninstall @openapitools/openapi-generator-cli \
@@ -66,7 +67,7 @@ RUN python3 -m ensurepip \
 # jans-linux-setup sync
 # =====================
 
-ENV JANS_SOURCE_VERSION=0783176284eec597c4fe6d83e892c82bcbe5e138
+ENV JANS_SOURCE_VERSION=e74ea8e27e59d35ff6e3c6f997e6c1df6a04ec83
 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
 
 # note that as we're pulling from a monorepo (with multiple project in it)

diff --git a/docker-admin-ui/requirements.txt b/docker-admin-ui/requirements.txt
@@ -1,4 +1,4 @@
 libcst<0.4
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.41.0
-git+https://github.com/JanssenProject/jans@a3f91108011ffd1ec17b581e3c209e12510d407e#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@e74ea8e27e59d35ff6e3c6f997e6c1df6a04ec83#egg=jans-pycloudlib&subdirectory=jans-pycloudlib