From 0efe1a512991178daa73df2cb5ad77bf57986b59 Mon Sep 17 00:00:00 2001 From: robbond Date: Sat, 7 Mar 2026 07:59:39 +0000 Subject: [PATCH] fix(deploy): deploy exact Jenkins image tag and force container recreation --- Jenkinsfile | 4 +++- scripts/deploy-prod.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c53e2fb..9715d68 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,11 +108,13 @@ rsync -az \ docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \ | ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" 'docker load' +ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker images | grep plesk-agency-portal || true" + ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \ "cd $DEPLOY_PATH && chmod +x ./scripts/deploy-prod.sh ./scripts/smoke-check.sh ./scripts/rollback-prod.sh" ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \ - "cd $DEPLOY_PATH && ./scripts/deploy-prod.sh" + "cd $DEPLOY_PATH && APP_IMAGE='${IMAGE_BUILD}' ./scripts/deploy-prod.sh" EOF ''' } diff --git a/scripts/deploy-prod.sh b/scripts/deploy-prod.sh index 5d34762..ba0f8d6 100755 --- a/scripts/deploy-prod.sh +++ b/scripts/deploy-prod.sh @@ -14,6 +14,6 @@ fi cd "${DEPLOY_PATH}" -APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml up -d +APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml up -d --no-build --force-recreate docker compose -f docker-compose.prod.yml ps