Merge pull request #70 from GluuFederation/cn-update-ui

GluuFederation · Feb 17, 2022 · 4fc332e · 4fc332e
2 parents ec3a686 + 97b277d
commit 4fc332e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -28,12 +28,19 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 # TODO:
 # - use NODE_ENV=production
 # - download build package (not git clone)
-ENV ADMIN_UI_VERSION=952492e371a1fb6a3087735c19ead496d574367e
-RUN mkdir -p /opt/jans \
-    && cd /opt/jans \
-    && git clone https://github.com/GluuFederation/flex \
-    && cd flex/admin-ui \
+ENV ADMIN_UI_VERSION=c94c1a0e77827fab7e24d1cf46ee1c91f4582383
+
+# 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
+RUN git clone --filter blob:none --no-checkout https://github.com/GluuFederation/flex /tmp/flex \
+    && cd /tmp/flex \
+    && git sparse-checkout init --cone \
     && git checkout ${ADMIN_UI_VERSION} \
+    && git sparse-checkout set admin-ui \
+    && mkdir -p /opt/jans/flex \
+    && mv /tmp/flex/admin-ui /opt/jans/flex/admin-ui \
+    && rm -rf /tmp/flex \
+    && cd /opt/jans/flex/admin-ui \
     && npm install @openapitools/openapi-generator-cli \
     && npm run api \
     && npm install \

diff --git a/docker-admin-ui/requirements.txt b/docker-admin-ui/requirements.txt
@@ -1,4 +1,3 @@
-ldif3==3.2.2
 libcst<0.4
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.41.0

diff --git a/docker-casa/Dockerfile b/docker-casa/Dockerfile
@@ -5,7 +5,8 @@ FROM bellsoft/liberica-openjre-alpine:11
 # ===============
 
 RUN apk update \
-    && apk add --no-cache py3-pip openssl tini py3-cryptography py3-lxml py3-psycopg2 py3-grpcio \
+    && apk add --no-cache py3-pip openssl tini py3-cryptography py3-lxml py3-psycopg2 \
+    && apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.15/community py3-grpcio \
     && apk add --no-cache --virtual build-deps git wget \
     && mkdir -p /usr/java/latest \
     && ln -sf /usr/lib/jvm/jre /usr/java/latest/jre

diff --git a/docker-casa/requirements.txt b/docker-casa/requirements.txt
@@ -1,4 +1,6 @@
 ldif==4.1.1
 webdavclient3>=3.14.5
 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@878bd69b3ac75f0b9455d4bac85063054189b3ad#egg=jans-pycloudlib&subdirectory=jans-pycloudlib