reorganize production containers

docker-compose.production.yml

@@ -63,11 +63,18 @@ services:
       - traefik.http.routers.api.tls.certresolver=letsencrypt
       - traefik.http.services.api.loadbalancer.server.port=4000
 
-  marketplace:
+  # homepage (public-site, port 3003) + marketplace (port 3000) in one container
+  web:
     build:
       context: .
       dockerfile: Dockerfile.production
-    command: ["npm", "run", "start", "--workspace", "@rentaldrivego/marketplace"]
+    command:
+      - sh
+      - -c
+      - |
+        npm run start --workspace @rentaldrivego/public-site &
+        npm run start --workspace @rentaldrivego/marketplace &
+        wait -n
     networks:
       - internal
       - traefik-proxy
@@ -78,30 +85,18 @@ services:
     restart: unless-stopped
     labels:
       - traefik.enable=true
+      # homepage → public-site-svc (port 3003)
+      - traefik.http.routers.public-site.rule=Host(`${PUBLIC_SITE_DOMAIN}`)
+      - traefik.http.routers.public-site.entrypoints=websecure
+      - traefik.http.routers.public-site.tls.certresolver=letsencrypt
+      - traefik.http.routers.public-site.service=public-site-svc
+      - traefik.http.services.public-site-svc.loadbalancer.server.port=3003
+      # marketplace → marketplace-svc (port 3000)
       - traefik.http.routers.marketplace.rule=Host(`${MARKETPLACE_DOMAIN}`)
       - traefik.http.routers.marketplace.entrypoints=websecure
       - traefik.http.routers.marketplace.tls.certresolver=letsencrypt
-      - traefik.http.services.marketplace.loadbalancer.server.port=3000
-
-  dashboard:
-    build:
-      context: .
-      dockerfile: Dockerfile.production
-    command: ["npm", "run", "start", "--workspace", "@rentaldrivego/dashboard"]
-    networks:
-      - internal
-      - traefik-proxy
-    depends_on:
-      - api
-    env_file:
-      - .env.docker.production
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.http.routers.dashboard.rule=Host(`${DASHBOARD_DOMAIN}`)
-      - traefik.http.routers.dashboard.entrypoints=websecure
-      - traefik.http.routers.dashboard.tls.certresolver=letsencrypt
-      - traefik.http.services.dashboard.loadbalancer.server.port=3001
+      - traefik.http.routers.marketplace.service=marketplace-svc
+      - traefik.http.services.marketplace-svc.loadbalancer.server.port=3000
 
   admin:
     build:
@@ -123,11 +118,11 @@ services:
       - traefik.http.routers.admin.tls.certresolver=letsencrypt
       - traefik.http.services.admin.loadbalancer.server.port=3002
 
-  public-site:
+  dashboard:
     build:
       context: .
       dockerfile: Dockerfile.production
-    command: ["npm", "run", "start", "--workspace", "@rentaldrivego/public-site"]
+    command: ["npm", "run", "start", "--workspace", "@rentaldrivego/dashboard"]
     networks:
       - internal
       - traefik-proxy
@@ -138,10 +133,10 @@ services:
     restart: unless-stopped
     labels:
       - traefik.enable=true
-      - traefik.http.routers.public-site.rule=Host(`${PUBLIC_SITE_DOMAIN}`)
-      - traefik.http.routers.public-site.entrypoints=websecure
-      - traefik.http.routers.public-site.tls.certresolver=letsencrypt
-      - traefik.http.services.public-site.loadbalancer.server.port=3003
+      - traefik.http.routers.dashboard.rule=Host(`${DASHBOARD_DOMAIN}`)
+      - traefik.http.routers.dashboard.entrypoints=websecure
+      - traefik.http.routers.dashboard.tls.certresolver=letsencrypt
+      - traefik.http.services.dashboard.loadbalancer.server.port=3001
 
   pgmanage:
     image: cmdpromptinc/pgmanage-enterprise:latest