fix(ci): quote deploy-stage heredoc to preserve bash variable expansion

Reviewed-on: http://gitea.lan:3000/robbond/pleskSaas/pulls/55

Jenkinsfile

@@ -85,37 +85,67 @@ pipeline {
 
 stage('Deploy') {
   steps {
-    withCredentials([sshUserPrivateKey(
-      credentialsId: "${env.DEPLOY_SSH_CREDENTIAL_ID}",
-      keyFileVariable: 'SSH_KEY'
-    )]) {
-      sh '''
-bash -eo pipefail << 'EOF'
-set -euo pipefail
+    sh '''
+bash <<'EOF'
+set -euxo pipefail
 
-ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
+SSH_KEY="/var/lib/jenkins/.ssh/plesk_agency_deploy"
+SSH_USER="deploy"
+SSH_OPTS="-i ${SSH_KEY} -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+
+echo "SSH user from configured deploy key: ${SSH_USER}"
+echo "SSH key file path: ${SSH_KEY}"
+ls -l "${SSH_KEY}"
+ssh-keygen -y -f "${SSH_KEY}"
+
+echo "Testing remote SSH connectivity"
+ssh ${SSH_OPTS} "${SSH_USER}@${APP_HOST}" "whoami && hostname && pwd"
+
+echo "Deploying image tag: ${IMAGE_BUILD}"
+docker image inspect "${IMAGE_BUILD}" --format='{{.Id}} {{.RepoTags}}'
+
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts"
 
 rsync -az \
-  -e "ssh -i $SSH_KEY" \
+  -e "ssh ${SSH_OPTS}" \
   docker-compose.prod.yml \
-  "$APP_USER@$APP_HOST:$DEPLOY_PATH/"
+  "$SSH_USER@$APP_HOST:$DEPLOY_PATH/"
 
 rsync -az \
-  -e "ssh -i $SSH_KEY" \
+  -e "ssh ${SSH_OPTS}" \
   scripts/ \
-  "$APP_USER@$APP_HOST:$DEPLOY_PATH/scripts/"
+  "$SSH_USER@$APP_HOST:$DEPLOY_PATH/scripts/"
 
-docker save ${IMAGE_LATEST} ${IMAGE_BUILD} \
-  | ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" 'docker load'
+IMAGE_TAR="plesk-agency-portal-build.tar"
+echo "Creating image archive: ${IMAGE_TAR}"
+docker save -o "${IMAGE_TAR}" "${IMAGE_BUILD}"
+ls -lh "${IMAGE_TAR}"
+sha256sum "${IMAGE_TAR}"
 
-ssh -i "$SSH_KEY" "$APP_USER@$APP_HOST" \
+echo "Copying image archive to remote host via scp"
+scp ${SSH_OPTS} "${IMAGE_TAR}" "$SSH_USER@$APP_HOST:$DEPLOY_PATH/"
+
+echo "Verifying image archive exists on remote host"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "ls -lh $DEPLOY_PATH/plesk-agency-portal-build.tar"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "sha256sum $DEPLOY_PATH/plesk-agency-portal-build.tar"
+
+echo "Loading image archive on remote host"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "docker load -i $DEPLOY_PATH/plesk-agency-portal-build.tar"
+
+echo "Verifying exact image tag is available on remote host"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "docker image inspect ${IMAGE_BUILD} --format='{{.Id}} {{.RepoTags}}'"
+
+ssh ${SSH_OPTS} "$SSH_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"
+echo "Running remote deploy script with exact image tag"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" \
+  "cd $DEPLOY_PATH && APP_IMAGE='${IMAGE_BUILD}' ./scripts/deploy-prod.sh"
+
+echo "Printing final running container image metadata"
+ssh ${SSH_OPTS} "$SSH_USER@$APP_HOST" "docker inspect plesk-agency-portal --format='{{.Image}} {{.Created}}'"
 EOF
-      '''
-    }
+    '''
   }
 }
 

scripts/deploy-prod.sh

@@ -12,8 +12,13 @@ if [ ! -f "${DEPLOY_PATH}/docker-compose.prod.yml" ]; then
   exit 1
 fi
 
+if [ ! -f "${DEPLOY_PATH}/.env" ]; then
+  echo "Missing .env in ${DEPLOY_PATH}" >&2
+  exit 1
+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
+APP_IMAGE="${APP_IMAGE}" docker compose -f docker-compose.prod.yml ps

scripts/rollback-prod.sh

@@ -21,10 +21,20 @@ if [ ! -f "${DEPLOY_PATH}/docker-compose.prod.yml" ]; then
   exit 1
 fi
 
+if [ ! -f "${DEPLOY_PATH}/.env" ]; then
+  echo "Missing .env in ${DEPLOY_PATH}" >&2
+  exit 1
+fi
+
+if [ ! -f "${DEPLOY_PATH}/scripts/smoke-check.sh" ]; then
+  echo "Missing scripts/smoke-check.sh in ${DEPLOY_PATH}" >&2
+  exit 1
+fi
+
 cd "${DEPLOY_PATH}"
 
-APP_IMAGE="${PREVIOUS_IMAGE_TAG}" docker compose -f docker-compose.prod.yml up -d --no-build
+APP_IMAGE="${PREVIOUS_IMAGE_TAG}" docker compose -f docker-compose.prod.yml up -d --no-build --force-recreate
 
-"${DEPLOY_PATH}/smoke-check.sh" "${APP_BASE_URL}"
+"${DEPLOY_PATH}/scripts/smoke-check.sh" "${APP_BASE_URL}"
 
 docker compose -f docker-compose.prod.yml ps