fix(image): conform to nginx filesystem structure

GluuFederation · Feb 7, 2022 · c5cf5a9 · c5cf5a9
1 parent 7e48528
commit c5cf5a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -139,12 +139,12 @@ 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 \
+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/tmp && chmod -R g=u /var/lib/nginx/tmp \
-    && chgrp -R 0 /var/lib/nginx/html && chmod -R g=u /var/lib/nginx/html \
+    && 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
 

diff --git a/docker-admin-ui/scripts/bootstrap.py b/docker-admin-ui/scripts/bootstrap.py
@@ -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/templates/nginx-default.conf.tmpl b/docker-admin-ui/templates/nginx-default.conf.tmpl
@@ -1,4 +1,4 @@
-server_tokens off;
+# server_tokens off;
 
 server {
     listen 8080 default_server;