From dabfd03d0c43bc5877e47664bde8d04a762d150f Mon Sep 17 00:00:00 2001
From: Vincent Guillet <vincent.guillet2@orange.fr>
Date: Fri, 28 Nov 2025 16:29:25 +0000
Subject: [PATCH] Update docker-compose.yml

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

diff --git a/docker-compose.yml b/docker-compose.yml
index c536881..a5ddbed 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,6 @@ services:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/gameovergne_app?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
       SPRING_DATASOURCE_USERNAME: gameovergne
       SPRING_DATASOURCE_PASSWORD: gameovergne
-      # L'API écoute sur 3000 dans le container
       SERVER_PORT: 3000
     networks:
       - gameovergne
@@ -59,23 +58,27 @@ services:
       - traefik.enable=true
       - traefik.docker.network=traefik
 
-      # FRONT sous /gameovergne
-      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne`)
+      # FRONT sous /gameovergne (avec et sans slash final)
+      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && (Path(`/gameovergne`) || PathPrefix(`/gameovergne/`))
       - traefik.http.routers.gameovergne-client.entrypoints=edge
       - traefik.http.routers.gameovergne-client.service=gameovergne-client
-      # on met une priorité haute pour être sûr de passer avant d'éventuels autres routeurs sur ce host
-      - traefik.http.routers.gameovergne-client.priority=100
+      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
 
-      # Enlève /gameovergne avant d'envoyer vers Nginx (qui sert l'app sur /)
+      # Redirige /gameovergne vers /gameovergne/
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^https?://([^/]+)/gameovergne/?$
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.replacement=https://$${1}/gameovergne/
+      - traefik.http.middlewares.gameovergne-slash.redirectregex.permanent=true
+
+      # Enlève /gameovergne avant d'envoyer vers Nginx
       - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
-      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-client-stripprefix
 
-      # Proxy Presta via /ps (toujours vers ce conteneur Angular/Nginx)
-      - traefik.http.routers.gameovergne-ps.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/ps`)
+      # Proxy Presta via /gameovergne/ps -> Nginx (/ps)
+      - traefik.http.routers.gameovergne-ps.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne/ps`)
       - traefik.http.routers.gameovergne-ps.entrypoints=edge
       - traefik.http.routers.gameovergne-ps.service=gameovergne-client
+      - traefik.http.routers.gameovergne-ps.middlewares=gameovergne-client-stripprefix
 
-      # Nginx écoute sur 80 dans le conteneur
+      # Nginx écoute en 80
       - traefik.http.services.gameovergne-client.loadbalancer.server.port=80
 
 networks: