From 7d5512230f8b4992c564214531bc739449a87de1 Mon Sep 17 00:00:00 2001
From: robbond <rob@rdbsolutions.co.uk>
Date: Sat, 7 Mar 2026 08:31:54 +0000
Subject: [PATCH] fix(deploy): make image transfer explicit and verifiable in
 Jenkins deploy stage

---
 Jenkinsfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d9453df..034485c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -90,7 +90,7 @@ stage('Deploy') {
       keyFileVariable: 'SSH_KEY'
     )]) {
       sh '''
-bash -eo pipefail << 'EOF'
+bash -eo pipefail <<EOF
 set -euo pipefail
 
 ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
@@ -107,19 +107,19 @@ rsync -az \
 
 echo "Deploying image tag: ${IMAGE_BUILD}"
 
-IMAGE_TAR="plesk-agency-portal-build-${BUILD_NUMBER}.tar"
+IMAGE_TAR="plesk-agency-portal-build.tar"
 echo "Creating image archive: ${IMAGE_TAR}"
 docker save -o "${IMAGE_TAR}" "${IMAGE_BUILD}"
 ls -lh "${IMAGE_TAR}"
 
-echo "Copying image archive to remote host"
-rsync -az \
-  -e "ssh -i $SSH_KEY" \
-  "${IMAGE_TAR}" \
-  "$APP_USER@$APP_HOST:$DEPLOY_PATH/"
+echo "Copying image archive to remote host via scp"
+scp -i "$SSH_KEY" "${IMAGE_TAR}" "$APP_USER@$APP_HOST:$DEPLOY_PATH/"
+
+echo "Verifying image archive exists on remote host"
+ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "ls -lh $DEPLOY_PATH/plesk-agency-portal-build.tar"
 
 echo "Loading image archive on remote host"
-ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker load -i $DEPLOY_PATH/${IMAGE_TAR}"
+ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker load -i $DEPLOY_PATH/plesk-agency-portal-build.tar"
 
 ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "docker images | grep plesk-agency-portal || true"
 
-- 
2.39.5