diff --git a/Jenkinsfile b/Jenkinsfile index fb8d661..962ad40 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,9 @@ set -euxo pipefail 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" +SSH_COMMON_OPTS="-i ${SSH_KEY} -o BatchMode=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" +SSH_OPTS="-n ${SSH_COMMON_OPTS}" +RSYNC_SSH="ssh ${SSH_COMMON_OPTS}" echo "SSH user from configured deploy key: ${SSH_USER}" echo "SSH key file path: ${SSH_KEY}" @@ -113,12 +115,12 @@ docker image inspect "${IMAGE_BUILD}" --format='{{.Id}} {{.RepoTags}}' ssh -n ${SSH_OPTS} "$SSH_USER@$APP_HOST" "mkdir -p $DEPLOY_PATH/scripts" rsync -az \ - -e "ssh -n ${SSH_OPTS}" \ + -e "${RSYNC_SSH}" \ docker-compose.prod.yml \ "$SSH_USER@$APP_HOST:$DEPLOY_PATH/" rsync -az \ - -e "ssh -n ${SSH_OPTS}" \ + -e "${RSYNC_SSH}" \ scripts/ \ "$SSH_USER@$APP_HOST:$DEPLOY_PATH/scripts/"