vincentguillet/gameovergne-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: vincentguillet:dev
Branches Tags
vincentguillet:main vincentguillet:dev
..
compare: vincentguillet:cefb3c54c38f408b7a483505437e5bf7296e47f3
Branches Tags
vincentguillet:main vincentguillet:dev

4 Commits
dev ... cefb3c54c3

Author SHA1 Message Date
Vincent Guillet
cefb3c54c3 Merge remote-tracking branch 'origin/dev' 
Merge from dev
 2025-12-05 14:58:32 +01:00
Vincent Guillet
79bd33fe41 Merge pull request 'merge from dev' (#1) from dev into main 
Reviewed-on: #1
 2025-12-05 13:43:04 +00:00
Vincent Guillet
696e0ac817 Update jenkinsfile 2025-12-05 13:26:43 +00:00
Vincent Guillet
888ddc1362 Update jenkinsfile 2025-12-05 13:24:13 +00:00
2 changed files with 21 additions and 35 deletions
Expand all files Collapse all files

27
api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java
View File

@@ -61,26 +61,17 @@ public class SecurityConfig {
@Bean @Bean
public CorsConfigurationSource corsConfigurationSource() { public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration config = new CorsConfiguration(); CorsConfiguration config = new CorsConfiguration();
config.setAllowedOriginPatterns(Arrays.asList(
// IMPORTANT : origins explicites, sans path "http://localhost:4200",
config.setAllowedOrigins(Arrays.asList( "http://127.0.0.1:4200",
"http://localhost:4200", "https://dev.vincent-guillet.fr",
"http://127.0.0.1:4200", "https://projets.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"));
config.setExposedHeaders(Arrays.asList("Authorization"));
config.setAllowCredentials(true); config.setAllowCredentials(true);
// Autoriser tous les headers côté requête (plus robuste)
config.setAllowedHeaders(Arrays.asList("*"));
// Autoriser les méthodes classiques
config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
// Headers que le client *voit* dans la réponse
config.setExposedHeaders(Arrays.asList("Authorization", "Content-Type"));
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config); source.registerCorsConfiguration("/**", config);
return source; return source;

29
jenkinsfile
View File

@@ -2,12 +2,12 @@ pipeline {
agent none agent none
environment { environment {
REGISTRY = 'registry.vincent-guillet.fr' REGISTRY = 'registry.vincent-guillet.fr'
API_IMAGE_DEV = "${REGISTRY}/gameovergne-api:dev-latest" API_IMAGE_DEV = "${REGISTRY}/gameovergne-api:dev-latest"
CLIENT_IMAGE_DEV = "${REGISTRY}/gameovergne-client:dev-latest" CLIENT_IMAGE_DEV= "${REGISTRY}/gameovergne-client:dev-latest"
API_IMAGE_PROD = "${REGISTRY}/gameovergne-api:prod-latest" API_IMAGE_PROD = "${REGISTRY}/gameovergne-api:prod-latest"
CLIENT_IMAGE_PROD = "${REGISTRY}/gameovergne-client:prod-latest" CLIENT_IMAGE_PROD = "${REGISTRY}/gameovergne-client:prod-latest"
COMPOSE_PROJECT = 'gameovergne-app' COMPOSE_PROJECT = 'gameovergne-app'
} }
stages { stages {
@@ -48,6 +48,7 @@ pipeline {
} }
// ----- Push vers registry ----- // ----- Push vers registry -----
// Si tu as des credentials, tu peux les utiliser ici via withCredentials
sh """ sh """
echo "=== Push images vers ${REGISTRY} ===" echo "=== Push images vers ${REGISTRY} ==="
docker push ${API_IMAGE} docker push ${API_IMAGE}
@@ -77,11 +78,8 @@ pipeline {
echo "=== [DEV] docker compose down ===" 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 pull ===" echo "=== [DEV] docker compose up ==="
docker compose -f docker-compose.dev.yml pull docker compose -f docker-compose.dev.yml up -d mysql spring angular
echo "=== [DEV] docker compose up (force recreate) ==="
docker compose -f docker-compose.dev.yml up -d --force-recreate mysql spring angular
""" """
} }
} }
@@ -106,13 +104,10 @@ pipeline {
docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true
echo "=== [PROD] docker compose down ===" echo "=== [PROD] docker compose down ==="
docker compose -f docker-compose.prod.yml down || true docker compose -f docker-compose.prod.yml down -v || true
echo "=== [PROD] docker compose pull ===" echo "=== [PROD] docker compose up ==="
docker compose -f docker-compose.prod.yml pull docker compose -f docker-compose.prod.yml up -d mysql spring angular
echo "=== [PROD] docker compose up (force recreate) ==="
docker compose -f docker-compose.prod.yml up -d --force-recreate mysql spring angular
""" """
} }
} }