Merge branch 'v1.106' into ui_fix_1.106

Signed-off-by: Matt Ray <github@mattray.dev>

ui/Dockerfile

@@ -22,5 +22,7 @@ ENV BASE_URL=/model
 
 USER 1001
 
+ENV BASE_URL=/model
+
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]

ui/Dockerfile.cross

@@ -1,5 +1,4 @@
 FROM nginx:alpine
-
 COPY ./dist /var/www
 COPY default.nginx.conf /etc/nginx/conf.d/
 COPY nginx.conf /etc/nginx/
@@ -13,7 +12,5 @@ RUN chown 1001:1000 -R /usr/local/bin/docker-entrypoint.sh
 
 ENV BASE_URL=/model
 
-USER 1001
-
 ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]