From 99d2c5738cf77db393237bd6ca1ababa7b7c0d00 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Fri, 18 Jul 2025 16:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=BF=E4=B8=BB=E6=9C=BAdo?=
 =?UTF-8?q?cker=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aaf7f22..ef94ce8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,5 @@
 pipeline {
-    agent {
-        dockerfile {
-            // 使用当前目录下的 Dockerfile.buildagent
-            filename "Dockerfile.buildagent"
-        }
-    }
+    agent any  // Jenkins 宿主机作为默认 agent
 //     tools {
 //         maven 'M3'  // 必须在 Jenkins → Manage Jenkins → Global Tool Configuration 中配置过
 //     }
@@ -22,15 +17,27 @@ pipeline {
             }
         }
 
-        stage('Build with Maven') {
+        stage('Build with Maven in JDK 8') {
+            agent {
+                dockerfile {
+                    filename "Dockerfile.buildagent"
+                }
+            }
             steps {
                 echo "🛠️ 正在使用 Maven 构建..."
-                sh '''
-                    mvn clean package -s settings.xml
-                '''
+                sh 'mvn clean package -s settings.xml'
             }
         }
 
+//         stage('Build with Maven') {
+//             steps {
+//                 echo "🛠️ 正在使用 Maven 构建..."
+//                 sh '''
+//                     mvn clean package -s settings.xml
+//                 '''
+//             }
+//         }
+
         stage('Check Jar File') {
             steps {
                 sh 'ls -la ruoyi-admin/target/'  // 确保 jar 文件存在
@@ -38,6 +45,7 @@ pipeline {
         }
         // 检查是否可以使用宿主机docker
         stage('Check Docker') {
+            agent any
             steps {
                 echo "🔍 检查宿主机 Docker 版本..."
                 sh 'which docker && docker --version'
@@ -45,6 +53,7 @@ pipeline {
         }
 
         stage('Build Docker Image') {
+            agent any
             steps {
                 echo "🐋 正在构建 Docker 镜像..."
                 sh 'docker build -t "$DOCKER_IMAGE" .'
@@ -52,8 +61,9 @@ pipeline {
         }
 
         stage('Stop Old Container') {
+            agent any
             steps {
-                echo "🛑 正在停止旧的容器（如果存在）..."
+                echo "🛑 正在停止旧容器..."
                 sh '''
                     if [ "$(docker ps -f 'name=sczx_web-container' --format '{{.Status}}')" ]; then
                         docker stop sczx_web-container
@@ -64,6 +74,7 @@ pipeline {
         }
 
         stage('Run New Container') {
+            agent any
             steps {
                 echo "🟢 正在运行新的容器..."
                 sh """