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")); 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 diff --git a/jenkinsfile b/jenkinsfile index c696519..413f7ba 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 """ } }