Merge remote-tracking branch 'origin/dev'

merge
This commit is contained in:
Vincent Guillet
2025-12-05 15:28:32 +01:00

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,7 +48,6 @@ 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}
@@ -78,8 +77,11 @@ 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 up ===" echo "=== [DEV] docker compose pull ==="
docker compose -f docker-compose.dev.yml up -d mysql spring angular docker compose -f docker-compose.dev.yml pull
echo "=== [DEV] docker compose up (force recreate) ==="
docker compose -f docker-compose.dev.yml up -d --force-recreate mysql spring angular
""" """
} }
} }
@@ -104,10 +106,13 @@ 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 -v || true docker compose -f docker-compose.prod.yml down || true
echo "=== [PROD] docker compose up ===" echo "=== [PROD] docker compose pull ==="
docker compose -f docker-compose.prod.yml up -d mysql spring angular docker compose -f docker-compose.prod.yml pull
echo "=== [PROD] docker compose up (force recreate) ==="
docker compose -f docker-compose.prod.yml up -d --force-recreate mysql spring angular
""" """
} }
} }