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

merge from dev #1

Merged
vincentguillet merged 4 commits from dev into main 2025-12-05 13:43:04 +00:00
Conversation 0 Commits 4 Files Changed 3 +12 -9
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,8 @@ public class SecurityConfig {
config.setAllowedOriginPatterns(Arrays.asList( config.setAllowedOriginPatterns(Arrays.asList(
"http://localhost:4200", "http://localhost:4200",
"http://127.0.0.1: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.setAllowedMethods(Arrays.asList("GET","POST","PUT","DELETE","OPTIONS"));
config.setAllowedHeaders(Arrays.asList("Authorization","Content-Type","Accept")); config.setAllowedHeaders(Arrays.asList("Authorization","Content-Type","Accept"));

2
docker-compose.prod.yml
View File

@@ -10,6 +10,8 @@ services:
MYSQL_PASSWORD: gameovergne MYSQL_PASSWORD: gameovergne
volumes: volumes:
- ./mysql-data-prod:/var/lib/mysql - ./mysql-data-prod:/var/lib/mysql
ports:
- "3366:3306"
networks: networks:
- gameovergne - gameovergne
restart: unless-stopped restart: unless-stopped

16
jenkinsfile
View File

@@ -75,11 +75,11 @@ pipeline {
echo "=== [DEV] Nettoyage anciens conteneurs ===" echo "=== [DEV] Nettoyage anciens conteneurs ==="
docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true
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 up ===" 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
""" """
} }
} }
@@ -103,11 +103,11 @@ pipeline {
echo "=== [PROD] Nettoyage anciens conteneurs ===" echo "=== [PROD] Nettoyage anciens conteneurs ==="
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 -v || true docker compose -f docker-compose.prod.yml down -v || true
echo "=== [PROD] docker-compose up ===" 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
""" """
} }
} }