From b79068623fdcfcfe51a5b6afeb3890a3cf1ff97e Mon Sep 17 00:00:00 2001 From: Vincent Guillet Date: Fri, 5 Dec 2025 14:27:59 +0000 Subject: [PATCH] Update jenkinsfile --- jenkinsfile | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/jenkinsfile b/jenkinsfile index 413f7ba..5d9e43c 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -2,12 +2,12 @@ pipeline { agent none environment { - REGISTRY = 'registry.vincent-guillet.fr' - API_IMAGE_DEV = "${REGISTRY}/gameovergne-api:dev-latest" - CLIENT_IMAGE_DEV= "${REGISTRY}/gameovergne-client:dev-latest" - API_IMAGE_PROD = "${REGISTRY}/gameovergne-api:prod-latest" - CLIENT_IMAGE_PROD = "${REGISTRY}/gameovergne-client:prod-latest" - COMPOSE_PROJECT = 'gameovergne-app' + REGISTRY = 'registry.vincent-guillet.fr' + API_IMAGE_DEV = "${REGISTRY}/gameovergne-api:dev-latest" + CLIENT_IMAGE_DEV = "${REGISTRY}/gameovergne-client:dev-latest" + API_IMAGE_PROD = "${REGISTRY}/gameovergne-api:prod-latest" + CLIENT_IMAGE_PROD = "${REGISTRY}/gameovergne-client:prod-latest" + COMPOSE_PROJECT = 'gameovergne-app' } stages { @@ -48,7 +48,6 @@ pipeline { } // ----- Push vers registry ----- - // Si tu as des credentials, tu peux les utiliser ici via withCredentials sh """ echo "=== Push images vers ${REGISTRY} ===" docker push ${API_IMAGE} @@ -78,8 +77,11 @@ pipeline { 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 pull ===" + 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 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 ===" - docker compose -f docker-compose.prod.yml up -d mysql spring angular + echo "=== [PROD] docker compose pull ===" + 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 """ } }