fix: nginx for ui and relative paths

NSLS-II-PDF · Apr 10, 2024 · c76b3b7 · c76b3b7
1 parent e524fa1
commit c76b3b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/containers/mmm5-tax-day-compose.yaml b/containers/mmm5-tax-day-compose.yaml
@@ -27,7 +27,7 @@ services:
     command: python3 /src/bluesky-adaptive-ui/bluesky_adaptive_ui/default_dash_app/app.py --agent-address gsas
     volumes:
       - type: bind
-        source: ../bluesky-adaptive-ui
+        source: ../../bluesky-adaptive-ui
         target: /src/bluesky-adaptive-ui
         read_only: true
 
@@ -71,6 +71,9 @@ services:
     depends_on:
       gsas:
         condition: service_started
+      gsas-ui:
+        condition: service_started
       kmeans-gsas:
         condition: service_started
 
+
diff --git a/containers/nginx/locs.d/gsas.conf b/containers/nginx/locs.d/gsas.conf
@@ -1,13 +1,14 @@
-location /gsas/ {
-    proxy_pass http://gsas:8000/;
+
+location /gsas-ui/ {
+    proxy_pass http://gsas-ui:8050/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_read_timeout 60s;
 }
 
-location /gsas/ui/ {
-    proxy_pass http://gsas-ui:8050/;
+location /gsas/ {
+    proxy_pass http://gsas:8000/;
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;