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

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

diff --git a/docker-compose.yml b/docker-compose.yml
index c94c191..bf1df54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,6 +28,8 @@ services:
       SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/gameovergne_app?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC
       SPRING_DATASOURCE_USERNAME: gameovergne
       SPRING_DATASOURCE_PASSWORD: gameovergne
+      # IMPORTANT : Spring doit écouter sur 3000
+      SERVER_PORT: 3000
     networks:
       - gameovergne
       - traefik
@@ -45,7 +47,7 @@ services:
       - traefik.http.middlewares.gameovergne-api-stripprefix.stripprefix.prefixes=/gameovergne-api
 
   angular:
-    image: registry.vincent-guillet.fr/gameovergne-client:dev-latest
+    image: registry.vincent-guillet.fr/gameovergne-client:dev-ngserve
     container_name: gameovergne-client
     depends_on:
       - spring
@@ -57,21 +59,28 @@ services:
       - traefik.enable=true
       - traefik.docker.network=traefik
 
-      # FRONT sous /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
-      - traefik.http.services.gameovergne-client.loadbalancer.server.port=80
-
-      # Middleware : ajoute un "/" si on arrive sur /gameovergne sans slash
       - traefik.http.routers.gameovergne-client.middlewares=gameovergne-slash,gameovergne-client-stripprefix
+
+      # 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
 
-      # Ensuite on enlève le préfixe /gameovergne avant d'envoyer à Nginx
+      # 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
+
+      # UN SEUL port déclaré pour ce service (4200, ng serve)
+      - traefik.http.services.gameovergne-client.loadbalancer.server.port=4200
+
 networks:
   traefik:
     external: true