diff --git a/Jenkinsfile b/Jenkinsfile index 3a15bd5d3..4b52dad60 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,39 +120,54 @@ pipeline { } } - stage('Docker Compose Deploy') { - steps { - script { - def cfg = PROJECT_CONFIG[params.PROJECT_NAME] - withCredentials([usernamePassword(credentialsId: cfg.sshCredId, usernameVariable: 'SSH_USER', passwordVariable: 'SSH_PASS')]) { - if(params.PROJECT_NAME == "fangjia-script"){ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' mkdir -p /home/docker/fangjia-script/scripts/fangjia - mkdir -p /home/docker/fangjia-script/logs' - sh """ - # 上传 fat jar - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no target/fangjia-script.jar \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/fangjia-script.jar - # 上传 groovy 脚本目录(-r 递归) - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no -r src/main/groovy/fangjia $SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/fangjia - # 上传 crontab - sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no crontab.txt \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' docker kill --signal=SIGHUP ${cfg.serviceName}' - """ - - }else{ + stage('Docker Compose Deploy') { + steps { + script { + def cfg = PROJECT_CONFIG[params.PROJECT_NAME] + withCredentials([usernamePassword(credentialsId: cfg.sshCredId, usernameVariable: 'SSH_USER', passwordVariable: 'SSH_PASS')]) { + if (params.PROJECT_NAME == "fangjia-script") { + def buildDir = cfg.buildDir ?: params.PROJECT_NAME sh """ - sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' - cd ${cfg.deployBase}/${cfg.composeDir} - docker compose pull - docker compose up -d --no-deps --force-recreate ${cfg.serviceName} - docker image prune -f - ' + # 确保目录存在 + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$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 \ + deliverables/${buildDir}/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 \ + deliverables/${buildDir}/src/main/groovy/fangjia \ + \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/scripts/fangjia + + # 上传 crontab + sshpass -p "\$SSH_PASS" scp -o StrictHostKeyChecking=no \ + deliverables/${buildDir}/crontab.txt \ + \$SSH_USER@${cfg.deployHost}:/home/docker/fangjia-script/crontab.txt + + # 热重载 + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' + docker kill --signal=SIGHUP ${cfg.serviceName} + ' + """ + } else { + sh """ + sshpass -p "\$SSH_PASS" ssh -o StrictHostKeyChecking=no \$SSH_USER@${cfg.deployHost} ' + cd ${cfg.deployBase}/${cfg.composeDir} + docker compose pull + docker compose up -d --no-deps --force-recreate ${cfg.serviceName} + docker image prune -f + ' """ } - - } - } - } - } + } + } + } + } } post {