Update docker-compose.yml

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:
+angular:
-    image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
+  image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
-    container_name: gameovergne-client
+  container_name: gameovergne-client
-    depends_on:
+  depends_on:
-      - spring
+    - spring
-    networks:
+  networks:
-      - gameovergne
+    - gameovergne
-      - traefik
+    - traefik
-    restart: unless-stopped
+  restart: unless-stopped
-    labels:
+  labels:
-      - traefik.enable=true
+    - traefik.enable=true
-      - traefik.docker.network=traefik
+    - traefik.docker.network=traefik
 
-      # FRONT : tout ce qui commence par /gameovergne va vers ce conteneur
+    # FRONT sous /gameovergne (avec et sans slash final)
-      - traefik.http.routers.gameovergne-client.rule=Host(`dev.vincent-guillet.fr`) && PathPrefix(`/gameovergne`)
+    - 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.entrypoints=edge
-      - traefik.http.routers.gameovergne-client.service=gameovergne-client
+    - 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
+    # Redirige /gameovergne vers /gameovergne/
-      - traefik.http.routers.gameovergne-client.middlewares=gameovergne-client-stripprefix
+    - traefik.http.middlewares.gameovergne-slash.redirectregex.regex=^https?://([^/]+)/gameovergne$
-      - traefik.http.middlewares.gameovergne-client-stripprefix.stripprefix.prefixes=/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
+    # Enlève /gameovergne avant d'envoyer vers Nginx
-      - traefik.http.services.gameovergne-client.loadbalancer.server.port=80
+    - 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: