diff --git a/Jenkinsfile b/Jenkinsfile index 540cf5c8f..0b1b40c74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -129,35 +129,35 @@ pipeline { def buildDir = cfg.buildDir ?: params.PROJECT_NAME sh """ # 确保目录存在 - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' mkdir -p /home/docker/fangjia-script/scripts/fangjia mkdir -p /home/docker/fangjia-script/logs ' # 上传 fat jar - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no \ + sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \ projects/fangjia-script/target/fangjia-script.jar \ \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar # 上传 groovy 脚本目录 - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -r \ + sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa -r \ projects/fangjia-script/src/main/groovy/* \ \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/ # 上传 crontab - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no \ + sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa \ projects/fangjia-script/crontab.txt \ \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt # 热重载 - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' docker exec fangjia-script kill -USR2 1 ' """ } else { if(cfg.deployHost instanceof String){ sh """ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${cfg.deployHost} ' cd ${cfg.deployBase}/${cfg.composeDir} docker compose up -d --no-deps --force-recreate ${cfg.serviceName} ' @@ -165,7 +165,7 @@ pipeline { }else{ for(def host in cfg.deployHost){ sh """ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${host} ' + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa $SSH_USER@${host} ' cd ${cfg.deployBase}/${cfg.composeDir} docker compose up -d --no-deps --force-recreate ${cfg.serviceName} '