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

---
 docker-compose.yml | 53 ++++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 658986f..3973709 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,30 +47,41 @@ services:
       - traefik.http.routers.gameovergne-api.middlewares=gameovergne-api-stripprefix
       - traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
 
-  angular:
-    image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
-    container_name: gameovergne-client
-    depends_on:
-      - spring
-    networks:
-      - gameovergne
-      - traefik
-    restart: unless-stopped
-    labels:
-      - traefik.enable=true
-      - traefik.docker.network=traefik
+angular:
+  image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
+  container_name: gameovergne-client
+  depends_on:
+    - spring
+  networks:
+    - gameovergne
+    - traefik
+  restart: unless-stopped
+  labels:
+    - traefik.enable=true
+    - traefik.docker.network=traefik
 
-      # FRONT : tout ce qui commence par /gameovergne va vers ce conteneur
-      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne`)
-      - traefik.http.routers.gameovergne-client.entrypoints=edge
-      - traefik.http.routers.gameovergne-client.service=gameovergne-client
+    # 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
+    - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
 
-      # On enlève /gameovergne avant d'envoyer vers Nginx
-      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-client-stripprefix
-      - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
+    # 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
 
-      # Nginx écoute en 80 dans l'image front
-      - traefik.http.services.gameovergne-client.loadbalancer.server.port=80
+    # Enlève /gameovergne avant d'envoyer vers Nginx
+    - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/gameovergne
+
+    # Service vers Nginx (port 80 dans le conteneur)
+    - traefik.http.services.gameovergne-client.loadbalancer.server.port=80
+
+    # Proxy Presta via /gameovergne/ps -> même service
+    - 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
 
 networks:
   traefik: