From 017a6e32685d8fa1c042291f54d1443112fe3001 Mon Sep 17 00:00:00 2001
From: zk <sim18502043706@163.com>
Date: Tue, 2 Jun 2026 19:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E7=BD=B2=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88v=E5=93=88=E5=93=88=E5=93=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile        | 23 ++++++++---------------
 docker-compose.yml |  4 ++--
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 81ad780..a12b2d4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,8 +1,8 @@
 /**
  * OfferPie Job Cleaner 部署流水线
  *
- * 架构：Jenkins 本机构建镜像 → 本机重启容器
- * 部署目录：/opt/offerpie/job-cleaner/
+ * Jenkins 容器挂载了宿主机 docker.sock，镜像共享。
+ * 直接在 workspace 内 build + compose up。
  */
 pipeline {
     agent any
@@ -16,7 +16,6 @@ pipeline {
         IMAGE_NAME = 'offerpie-job-cleaner'
         IMAGE_TAG = 'latest'
         CONTAINER_NAME = 'offerpie-job-cleaner'
-        DEPLOY_DIR = '/var/jenkins_home/deploy/job-cleaner'
     }
 
     stages {
@@ -25,10 +24,7 @@ pipeline {
                 expression { params.ACTION == 'stop' }
             }
             steps {
-                script {
-                    sh "cd ${DEPLOY_DIR} && docker compose down || true"
-                    echo "✅ 服务已停止"
-                }
+                sh "docker compose down || true"
             }
         }
 
@@ -58,14 +54,11 @@ pipeline {
                 expression { params.ACTION == 'deploy' }
             }
             steps {
-                script {
-                    sh "mkdir -p ${DEPLOY_DIR}"
-                    sh "cp docker-compose.yml ${DEPLOY_DIR}/docker-compose.yml"
-                    sh "cd ${DEPLOY_DIR} && docker compose down || true"
-                    sh "cd ${DEPLOY_DIR} && docker compose up -d"
-                    sleep 5
-                    sh "docker ps -f name=${CONTAINER_NAME} --format '{{.Status}}'"
-                }
+                // 停旧启新，docker-compose.yml 就在当前 workspace
+                sh "docker compose down || true"
+                sh "docker compose up -d"
+                sleep 5
+                sh "docker ps -f name=${CONTAINER_NAME} --format '{{.Status}}'"
             }
         }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 83a1cb8..1b2943f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,13 +1,13 @@
 services:
   cleaner:
-    build: .
+    image: offerpie-job-cleaner:latest
     container_name: offerpie-job-cleaner
     restart: unless-stopped
     environment:
       - ENV=prod
       - TZ=Asia/Shanghai
     volumes:
-      - ./logs:/app/logs
+      - /opt/offerpie/job-cleaner/logs:/app/logs
     deploy:
       resources:
         limits: