Merge pull request #3 from CityConnect-TQS/CC-333-Switch-from-subdoma…

…ins-to-paths CC-333 Switch from subdomains to paths
CityConnect-TQS · May 24, 2024 · a646712 · a646712
2 parents 559a7c2 + d285006
commit a646712
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - main
-      - CC-321-Deploy-to-virtual-machine # Only for testing
   workflow_dispatch:
 
 concurrency:

diff --git a/compose.prod.yaml b/compose.prod.yaml
@@ -53,7 +53,7 @@ services:
       - maven_data:/root/.m2
     labels:
       - traefik.enable=true
-      - traefik.http.routers.backend.rule=Host(`api.${HOST_URL:-localhost}`)
+      - traefik.http.routers.backend.rule=PathPrefix(`/api`)
       - traefik.http.services.backend.loadbalancer.server.port=8080
       - traefik.http.routers.backend.entrypoints=web
 
@@ -71,14 +71,12 @@ services:
       - bun_cache:/root/.bun/install/cache
     networks:
       - frontend
-    environment:
-      - VITE_HOST_URL=${HOST_URL:-localhost}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.client-portal.rule=Host(`${HOST_URL:-localhost}`)
+      - traefik.http.routers.client-portal.rule=PathPrefix(`/`)
       - traefik.http.services.client-portal.loadbalancer.server.port=5173
       - traefik.http.routers.client-portal.entrypoints=web
-  
+
   staff-portal:
     depends_on:
       backend:
@@ -93,12 +91,10 @@ services:
       - bun_cache:/root/.bun/install/cache
     networks:
       - frontend
-    environment:
-      - VITE_HOST_URL=${HOST_URL:-localhost}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.staff-portal.rule=Host(`staff.${HOST_URL:-localhost}`)
-      - traefik.http.services.staff-portal.loadbalancer.server.port=5173
+      - traefik.http.routers.staff-portal.rule=PathPrefix(`/staff`)
+      - traefik.http.services.staff-portal.loadbalancer.server.port=80
       - traefik.http.routers.staff-portal.entrypoints=web
 
   digital-signage:
@@ -115,12 +111,10 @@ services:
       - bun_cache:/root/.bun/install/cache
     networks:
       - frontend
-    environment:
-      - VITE_HOST_URL=${HOST_URL:-localhost}
     labels:
       - traefik.enable=true
-      - traefik.http.routers.digital-signage.rule=Host(`digital.${HOST_URL:-localhost}`)
-      - traefik.http.services.digital-signage.loadbalancer.server.port=5173
+      - traefik.http.routers.digital-signage.rule=PathPrefix(`/digital`)
+      - traefik.http.services.digital-signage.loadbalancer.server.port=80
       - traefik.http.routers.digital-signage.entrypoints=web
 
   traefik:

diff --git a/compose.yaml b/compose.yaml
@@ -54,7 +54,7 @@ services:
       - maven_data:/root/.m2
     labels:
       - traefik.enable=true
-      - traefik.http.routers.backend.rule=Host(`api.localhost`)
+      - traefik.http.routers.backend.rule=PathPrefix(`/api`)
       - traefik.http.services.backend.loadbalancer.server.port=8080
       - traefik.http.routers.backend.entrypoints=web
 
@@ -75,10 +75,10 @@ services:
       - VITE_HOST_URL=localhost
     labels:
       - traefik.enable=true
-      - traefik.http.routers.client-portal.rule=Host(`localhost`)
+      - traefik.http.routers.client-portal.rule=PathPrefix(`/`)
       - traefik.http.services.client-portal.loadbalancer.server.port=5173
       - traefik.http.routers.client-portal.entrypoints=web
-  
+
   staff-portal:
     depends_on:
       backend:
@@ -96,7 +96,7 @@ services:
       - VITE_HOST_URL=localhost
     labels:
       - traefik.enable=true
-      - traefik.http.routers.staff-portal.rule=Host(`staff.localhost`)
+      - traefik.http.routers.staff-portal.rule=PathPrefix(`/staff`)
       - traefik.http.services.staff-portal.loadbalancer.server.port=5173
       - traefik.http.routers.staff-portal.entrypoints=web
 
@@ -117,7 +117,7 @@ services:
       - VITE_HOST_URL=localhost
     labels:
       - traefik.enable=true
-      - traefik.http.routers.digital-signage.rule=Host(`digital.localhost`)
+      - traefik.http.routers.digital-signage.rule=PathPrefix(`/digital`)
       - traefik.http.services.digital-signage.loadbalancer.server.port=5173
       - traefik.http.routers.digital-signage.entrypoints=web