fix(image): update admin-ui image assets

GluuFederation · Feb 8, 2022 · b92bcc6 · b92bcc6
2 parents 8bd1a16 + c5cf5a9
commit b92bcc6
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 28 deletions.
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -1,12 +1,13 @@
-FROM nginx:1.20.1-alpine
+FROM node:14.18.2-alpine3.14
 
 # ======
 # alpine
 # ======
 
 RUN apk update \
-    && apk add --no-cache tini openssl py3-pip py3-cryptography py3-grpcio py3-psycopg2 npm \
-    && apk add --no-cache --virtual build-deps git openjdk11-jre-headless
+    && apk add --no-cache tini openssl py3-pip py3-cryptography py3-psycopg2 nginx \
+    && apk add --no-cache --virtual build-deps git openjdk11-jre-headless \
+    && apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.15/community py3-grpcio
 
 # =====
 # nginx
@@ -27,7 +28,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf
 # TODO:
 # - use NODE_ENV=production
 # - download build package (not git clone)
-ENV ADMIN_UI_VERSION=7513ee633a3d6ef541b960c96e2702a62325c636
+ENV ADMIN_UI_VERSION=8bd1a16a71e6940c7f7135524f69d1b64d4fcf79
 RUN mkdir -p /opt/jans \
     && cd /opt/jans \
     && git clone https://github.com/GluuFederation/flex \
@@ -110,8 +111,6 @@ ENV CN_SECRET_ADAPTER=vault \
 ENV CN_WAIT_MAX_TIME=300 \
     CN_WAIT_SLEEP_DURATION=10
 
-
-
 # ==========
 # misc stuff
 # ==========
@@ -127,21 +126,29 @@ LABEL name="Gluu Admin UI" \
 COPY templates /app/templates/
 COPY scripts /app/scripts/
 RUN chmod +x /app/scripts/entrypoint.sh
-# # create non-root user
-RUN adduser -s /bin/sh -D -G root -u 1000 web
+
+# forward logs to stdout and stderr
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
+# add existing node user to root group
+RUN addgroup node root
 
 # make empty folders
-RUN mkdir -p /opt/jans/gluu-admin-ui/dist \
-    && touch /var/run/nginx.pid
+RUN mkdir -p /opt/jans/flex/admin-ui/dist \
+    && touch /run/nginx/nginx.pid
 
 # adjust ownership
-RUN chgrp -R 0 /etc/certs && chmod -R g=u /etc/certs \
-    && chgrp -R 0 /opt/jans/gluu-admin-ui/.env && chmod -R g=u /opt/jans/gluu-admin-ui/.env \
-    && chgrp -R 0 /opt/jans/gluu-admin-ui/dist && chmod -R g=u /opt/jans/gluu-admin-ui/dist \
-    && chgrp -R 0 /etc/nginx/conf.d/default.conf && chmod -R g=u /etc/nginx/conf.d/default.conf \
-    && chgrp -R 0 /usr/share/nginx/html && chmod -R g=u /usr/share/nginx/html \
-    && chgrp -R 0 /var/cache/nginx && chmod -R g=u /var/cache/nginx \
-    && chgrp -R 0 /var/run/nginx.pid && chmod -R g=u /var/run/nginx.pid
+RUN chown -R 1000:1000 /var/lib/nginx \
+    && chgrp -R 0 /etc/certs && chmod -R g=u /etc/certs \
+    && chgrp -R 0 /opt/jans/flex/admin-ui/.env && chmod -R g=u /opt/jans/flex/admin-ui/.env \
+    && chgrp -R 0 /opt/jans/flex/admin-ui/dist && chmod -R g=u /opt/jans/flex/admin-ui/dist \
+    && chgrp -R 0 /etc/nginx/http.d/default.conf && chmod -R g=u /etc/nginx/http.d/default.conf \
+    && chgrp -R 0 /var/lib/nginx && chmod -R g=u /var/lib/nginx \
+    && chgrp -R 0 /var/log/nginx && chmod -R g=u /var/log/nginx \
+    && chgrp -R 0 /run/nginx/nginx.pid && chmod -R g=u /run/nginx/nginx.pid
 
 USER 1000
-ENTRYPOINT ["tini", "-g", "--", "sh", "/app/scripts/entrypoint.sh"]
+
+ENTRYPOINT ["tini", "-g", "--"]
+CMD ["sh", "/app/scripts/entrypoint.sh"]
diff --git a/docker-admin-ui/requirements.txt b/docker-admin-ui/requirements.txt
@@ -1,3 +1,5 @@
 ldif3==3.2.2
 libcst<0.4
-git+https://github.com/JanssenProject/jans@d19fbfd6891d03fb0c76073dfa8ba2ffc44a3b9b#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+# pinned to py3-grpcio version to avoid failure on native extension build
+grpcio==1.41.0
+git+https://github.com/JanssenProject/jans@f88095b1f52f0639221e4109ed7262099e06d0e9#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
diff --git a/docker-admin-ui/scripts/bootstrap.py b/docker-admin-ui/scripts/bootstrap.py
@@ -15,7 +15,7 @@ def render_env(manager):
     with open("/app/templates/env.tmpl") as fr:
         txt = fr.read() % ctx
 
-    with open("/opt/jans/gluu-admin-ui/.env", "w") as fw:
+    with open("/opt/jans/flex/admin-ui/.env", "w") as fw:
         fw.write(txt)
 
 
@@ -26,7 +26,7 @@ def render_nginx_conf(manager):
         }
         txt = fr.read() % ctx
 
-    with open("/etc/nginx/conf.d/default.conf", "w") as fw:
+    with open("/etc/nginx/http.d/default.conf", "w") as fw:
         fw.write(txt)
 
 

diff --git a/docker-admin-ui/scripts/entrypoint.sh b/docker-admin-ui/scripts/entrypoint.sh
@@ -5,7 +5,7 @@ set -e
 python3 /app/scripts/wait.py
 python3 /app/scripts/bootstrap.py
 
-cd /opt/jans/gluu-admin-ui
+cd /opt/jans/flex/admin-ui
 npm run build:prod
-cp -R /opt/jans/gluu-admin-ui/dist/* /usr/share/nginx/html/
+cp -R /opt/jans/flex/admin-ui/dist/* /var/lib/nginx/html/
 exec nginx
diff --git a/docker-admin-ui/templates/nginx-default.conf.tmpl b/docker-admin-ui/templates/nginx-default.conf.tmpl
@@ -1,11 +1,11 @@
-server_tokens off;
+# server_tokens off;
 
 server {
     listen 8080 default_server;
     # listen [::]:8080 default_server ipv6only=on;
     server_name %(hostname)s;
 
-    root /usr/share/nginx/html;
+    root /var/lib/nginx/html;
     index index.html;
 
     location /admin {
@@ -27,14 +27,14 @@ server {
 
 #     # location / {
 #     #     # return 301 /admin;
-#     #     root /usr/share/nginx/html;
+#     #     root /var/lib/nginx/html;
 #     # }
 
 #     # location /admin {
-#     #     root /usr/share/nginx/html;
+#     #     root /var/lib/nginx/html;
 #     # }
 
-#     root /usr/share/nginx/html;
+#     root /var/lib/nginx/html;
 #     index index.html;
 
 #     location / {