优化 Jenkinsfile SSH 部署方式
- 统一使用 sshagent + 密钥认证替代 sshpass + 密码认证 - 所有项目使用统一的 SSH 凭证 deploy-server-ssh - 修复 SSH 命令引号闭合问题,改用单行命令格式 - 移除 PROJECT_CONFIG 中的 sshCredId 字段,新增 deployUser 字段 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Vendored
+10
-15
@@ -138,10 +138,8 @@ pipeline {
|
||||
ssh -o StrictHostKeyChecking=no \
|
||||
-o HostKeyAlgorithms=+ssh-rsa \
|
||||
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||
${deployUser}@${cfg.deployHost} '
|
||||
mkdir -p /home/docker/fangjia-script/scripts/fangjia
|
||||
mkdir -p /home/docker/fangjia-script/logs
|
||||
'
|
||||
${deployUser}@${cfg.deployHost} \
|
||||
'mkdir -p /home/docker/fangjia-script/scripts/fangjia && mkdir -p /home/docker/fangjia-script/logs'
|
||||
|
||||
# 上传 fat jar
|
||||
scp -o StrictHostKeyChecking=no \
|
||||
@@ -168,9 +166,8 @@ pipeline {
|
||||
ssh -o StrictHostKeyChecking=no \
|
||||
-o HostKeyAlgorithms=+ssh-rsa \
|
||||
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||
${deployUser}@${cfg.deployHost} '
|
||||
docker exec fangjia-script kill -USR2 1
|
||||
'
|
||||
${deployUser}@${cfg.deployHost} \
|
||||
'docker exec fangjia-script kill -USR2 1'
|
||||
"""
|
||||
} else {
|
||||
if(cfg.deployHost instanceof String){
|
||||
@@ -178,20 +175,18 @@ pipeline {
|
||||
ssh -o StrictHostKeyChecking=no \
|
||||
-o HostKeyAlgorithms=+ssh-rsa \
|
||||
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||
${deployUser}@${cfg.deployHost} '
|
||||
cd ${cfg.deployBase}/${cfg.composeDir}
|
||||
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
||||
"""
|
||||
${deployUser}@${cfg.deployHost} \
|
||||
'cd ${cfg.deployBase}/${cfg.composeDir} && docker compose up -d --no-deps --force-recreate ${cfg.serviceName}'
|
||||
"""
|
||||
}else{
|
||||
for(def host in cfg.deployHost){
|
||||
sh """
|
||||
ssh -o StrictHostKeyChecking=no \
|
||||
-o HostKeyAlgorithms=+ssh-rsa \
|
||||
-o PubkeyAcceptedKeyTypes=+ssh-rsa \
|
||||
${deployUser}@${host} '
|
||||
cd ${cfg.deployBase}/${cfg.composeDir}
|
||||
docker compose up -d --no-deps --force-recreate ${cfg.serviceName}
|
||||
"""
|
||||
${deployUser}@${host} \
|
||||
'cd ${cfg.deployBase}/${cfg.composeDir} && docker compose up -d --no-deps --force-recreate ${cfg.serviceName}'
|
||||
"""
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user