diff --git a/Jenkinsfile b/Jenkinsfile index fc5fb71..4bc308c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ /** * OfferPie Job Cleaner 部署流水线 * - * 架构:Jenkins 本地编译镜像 → scp 到目标机 → SSH 远程重启容器 - * 目标机目录:/opt/offerpie/job-cleaner/ + * 架构:Jenkins 本机构建镜像 → 本机重启容器 + * 部署目录:/opt/offerpie/job-cleaner/ */ pipeline { agent any @@ -12,30 +12,13 @@ pipeline { } environment { - // 目标服务器配置 - DEPLOY_HOST = '192.168.31.51' - DEPLOY_PORT = '22' - DEPLOY_USER = 'jsxq' - DEPLOY_PASS = '123456' - - // 项目配置 IMAGE_NAME = 'offerpie-job-cleaner' IMAGE_TAG = 'latest' CONTAINER_NAME = 'offerpie-job-cleaner' - REMOTE_DIR = '/opt/offerpie/job-cleaner' - - // SSH 命令前缀 - SSH_CMD = "sshpass -p '${DEPLOY_PASS}' ssh -o StrictHostKeyChecking=no -p ${DEPLOY_PORT} ${DEPLOY_USER}@${DEPLOY_HOST}" - SCP_CMD = "sshpass -p '${DEPLOY_PASS}' scp -o StrictHostKeyChecking=no -P ${DEPLOY_PORT}" + DEPLOY_DIR = '/opt/offerpie/job-cleaner' } stages { - stage('环境检查') { - steps { - sh 'sshpass -V' - } - } - stage('拉取代码') { steps { echo "拉取 ${params.BRANCH} 分支代码" @@ -45,49 +28,38 @@ pipeline { } } - stage('本地编译') { + stage('构建镜像') { steps { - echo "开始构建镜像" sh "docker build -t ${IMAGE_NAME}:${IMAGE_TAG} ." - echo "导出镜像" - sh "docker save -o ${IMAGE_NAME}.tar ${IMAGE_NAME}:${IMAGE_TAG}" - } - } - - stage('文件传输') { - steps { - echo "传输文件到目标服务器" - sh "${SSH_CMD} 'mkdir -p ${REMOTE_DIR}'" - sh "${SCP_CMD} ${IMAGE_NAME}.tar ${DEPLOY_USER}@${DEPLOY_HOST}:${REMOTE_DIR}/" - sh "${SCP_CMD} docker-compose.yml ${DEPLOY_USER}@${DEPLOY_HOST}:${REMOTE_DIR}/docker-compose.yml" } } stage('部署') { steps { script { - // 加载镜像 - sh "${SSH_CMD} 'docker load < ${REMOTE_DIR}/${IMAGE_NAME}.tar'" + // 确保部署目录存在 + sh "mkdir -p ${DEPLOY_DIR}" - // 停掉旧容器 - sh "${SSH_CMD} 'cd ${REMOTE_DIR} && docker compose down || true'" + // 拷贝 docker-compose.yml 到部署目录 + sh "cp docker-compose.yml ${DEPLOY_DIR}/docker-compose.yml" - // 启动新容器 - sh "${SSH_CMD} 'cd ${REMOTE_DIR} && docker compose up -d'" + // 停旧容器 → 启新容器 + sh "cd ${DEPLOY_DIR} && docker compose down || true" + sh "cd ${DEPLOY_DIR} && docker compose up -d" // 等待启动 - sh 'sleep 5' + sleep 5 - // 检查容器是否在运行 - sh "${SSH_CMD} 'docker ps -f name=${CONTAINER_NAME} --format \"{{.Status}}\"'" + // 检查容器状态 + sh "docker ps -f name=${CONTAINER_NAME} --format '{{.Status}}'" } } } stage('清理') { steps { - sh "${SSH_CMD} 'rm -f ${REMOTE_DIR}/${IMAGE_NAME}.tar'" - sh "rm -f ${IMAGE_NAME}.tar" + // 清理悬空镜像 + sh "docker image prune -f || true" } } } @@ -98,7 +70,6 @@ pipeline { } failure { echo '❌ 部署失败,请检查日志' - sh "rm -f ${IMAGE_NAME}.tar || true" } } }