From 9a27cd3789947c50ddea799baa0f49f4c91b2d62 Mon Sep 17 00:00:00 2001
From: Vincent Guillet <vincent.guillet2@orange.fr>
Date: Fri, 28 Nov 2025 14:54:23 +0000
Subject: [PATCH] Update docker-compose.yml

---
 docker-compose.yml | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9cf7c52..a67acf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,13 +37,14 @@ services:
       - traefik.enable=true
       - traefik.docker.network=traefik
 
-      # API sous /gameovergne-api
+      # API sous /gameovergne-api, priorité haute pour qu'elle "passe devant" Angular
       - traefik.http.routers.gameovergne-api.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne-api`)
       - traefik.http.routers.gameovergne-api.entrypoints=edge
       - traefik.http.routers.gameovergne-api.service=gameovergne-api
       - traefik.http.services.gameovergne-api.loadbalancer.server.port=3000
       - traefik.http.routers.gameovergne-api.middlewares=gameovergne-api-stripprefix
       - traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
+      - traefik.http.routers.gameovergne-api.priority=100
 
   angular:
     image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
@@ -58,31 +59,13 @@ services:
       - traefik.enable=true
       - traefik.docker.network=traefik
 
-      # FRONT sous /gameovergne (avec et sans slash final)
-      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && (Path(`/gameovergne`) || PathPrefix(`/gameovergne/`))
+      # FRONT : TOUT le host va vers Angular (sauf /gameovergne-api capté par le router ci-dessus)
+      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`)
       - traefik.http.routers.gameovergne-client.entrypoints=edge
       - traefik.http.routers.gameovergne-client.service=gameovergne-client
-      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
+      - traefik.http.routers.gameovergne-client.priority=1
 
-      # Ajoute un "/" si on arrive sur /gameovergne sans slash
-      - "traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^(.*/gameovergne)$$"
-      - "traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=$$1/"
-      - traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true
-
-      # Enlève /gameovergne avant d'envoyer vers Angular (dev server)
-      - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
-
-      # Router pour /ps vers le même conteneur Angular (ng serve + proxy.conf.json)
-      - traefik.http.routers.gameovergne-ps.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/ps`)
-      - traefik.http.routers.gameovergne-ps.entrypoints=edge
-      - traefik.http.routers.gameovergne-ps.service=gameovergne-client
-
-      # Router supplémentaire pour les assets Vite (/@vite/client, /chunk-*.js)
-      - traefik.http.routers.gameovergne-assets.rule=Host(`dev.vincent-guillet.fr`) && (PathPrefix(`/@vite`) || PathPrefix(`/chunk-`))
-      - traefik.http.routers.gameovergne-assets.entrypoints=edge
-      - traefik.http.routers.gameovergne-assets.service=gameovergne-client
-
-      # ng serve écoute sur 4200
+      # Angular dev server (ng serve) écoute sur 4200
       - traefik.http.services.gameovergne-client.loadbalancer.server.port=4200
 
 networks: