From 3026f0a13f1626eec00e30d40ec28370050783f3 Mon Sep 17 00:00:00 2001 From: Vincent Guillet Date: Fri, 5 Dec 2025 13:23:58 +0000 Subject: [PATCH 1/4] Update jenkinsfile --- jenkinsfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jenkinsfile b/jenkinsfile index c696519..3bcadcf 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -75,11 +75,11 @@ pipeline { echo "=== [DEV] Nettoyage anciens conteneurs ===" docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true - echo "=== [DEV] docker-compose down ===" - docker-compose -f docker-compose.dev.yml down -v || true + echo "=== [DEV] docker compose down ===" + docker compose -f docker compose.dev.yml down -v || true - echo "=== [DEV] docker-compose up ===" - docker-compose -f docker-compose.dev.yml up -d mysql spring angular + echo "=== [DEV] docker compose up ===" + docker compose -f docker compose.dev.yml up -d mysql spring angular """ } } @@ -103,11 +103,11 @@ pipeline { echo "=== [PROD] Nettoyage anciens conteneurs ===" docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true - echo "=== [PROD] docker-compose down ===" - docker-compose -f docker-compose.prod.yml down -v || true + echo "=== [PROD] docker compose down ===" + docker compose -f docker compose.prod.yml down -v || true - echo "=== [PROD] docker-compose up ===" - docker-compose -f docker-compose.prod.yml up -d mysql spring angular + echo "=== [PROD] docker compose up ===" + docker compose -f docker compose.prod.yml up -d mysql spring angular """ } } From 321e2fd546aa1f9828fadc0df0bfde28e1dc1b2e Mon Sep 17 00:00:00 2001 From: Vincent Guillet Date: Fri, 5 Dec 2025 13:27:16 +0000 Subject: [PATCH 2/4] Update jenkinsfile --- jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkinsfile b/jenkinsfile index 3bcadcf..413f7ba 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -76,10 +76,10 @@ pipeline { docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true echo "=== [DEV] docker compose down ===" - docker compose -f docker compose.dev.yml down -v || true + docker compose -f docker-compose.dev.yml down -v || true echo "=== [DEV] docker compose up ===" - docker compose -f docker compose.dev.yml up -d mysql spring angular + docker compose -f docker-compose.dev.yml up -d mysql spring angular """ } } @@ -104,10 +104,10 @@ pipeline { docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true echo "=== [PROD] docker compose down ===" - docker compose -f docker compose.prod.yml down -v || true + docker compose -f docker-compose.prod.yml down -v || true echo "=== [PROD] docker compose up ===" - docker compose -f docker compose.prod.yml up -d mysql spring angular + docker compose -f docker-compose.prod.yml up -d mysql spring angular """ } } From 01cafd5904b0dc90580b1928fce8ab6b4e234435 Mon Sep 17 00:00:00 2001 From: Vincent Guillet Date: Fri, 5 Dec 2025 13:35:48 +0000 Subject: [PATCH 3/4] Update docker-compose.prod.yml --- docker-compose.prod.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 2f65d0d..51e3d02 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -10,6 +10,8 @@ services: MYSQL_PASSWORD: gameovergne volumes: - ./mysql-data-prod:/var/lib/mysql + ports: + - "3366:3306" networks: - gameovergne restart: unless-stopped From ec9eb0dc7dfbc54d0e2b664b3fbde9f4b667d108 Mon Sep 17 00:00:00 2001 From: Vincent Guillet Date: Fri, 5 Dec 2025 13:40:48 +0000 Subject: [PATCH 4/4] Update api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java --- .../main/java/fr/gameovergne/api/config/SecurityConfig.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java b/api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java index 5ec9f12..ba09b27 100644 --- a/api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java +++ b/api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java @@ -64,7 +64,8 @@ public class SecurityConfig { config.setAllowedOriginPatterns(Arrays.asList( "http://localhost:4200", "http://127.0.0.1:4200", - "https://dev.vincent-guillet.fr" + "https://dev.vincent-guillet.fr", + "https://projets.vincent-guillet.fr" )); config.setAllowedMethods(Arrays.asList("GET","POST","PUT","DELETE","OPTIONS")); config.setAllowedHeaders(Arrays.asList("Authorization","Content-Type","Accept"));