From e45ec70526add804654deda2ecf0785ca160bc4b Mon Sep 17 00:00:00 2001
From: guoqibing <guoqibing@sino-assistance.com>
Date: Tue, 25 Nov 2025 10:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile     | 31 ++++++++++++++++++-------------
 JenkinsfileCopy | 45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 13 deletions(-)
 create mode 100644 JenkinsfileCopy

diff --git a/Jenkinsfile b/Jenkinsfile
index e7c5ea6..cfc64a3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,28 +1,30 @@
 pipeline {
-    /* 声明式流水线内容 */
+	/* 声明式流水线内容 */
     agent any
 
-
-
-    //  agent {
-	//	docker {
-	//		image 'maven:3-alpine'
-    //        label 'my-defined-label'
-    //        args '-v /tmp:/tmp'
-    //    }
-    //}
-
      stages {
 		stage('打包jar..........') {
 			steps {
 				echo '打包中...'
                 sh 'pwd'
-        		sh 'set JAVA_HOME=/var/jdk1.8.0_461/bin'
+                echo 'maven-start...'
         		sh '/apache-maven-3.9.11/bin/mvn -version'
         		sh '/apache-maven-3.9.11/bin/mvn clean package'
+        		echo 'maven-end...'
+        		sh 'cp ${PATH}/target/*.jar .'
                 echo '打包Success...'
             }
         }
+        stage('docker-Build') {
+			steps {
+				sh 'docker build -f ${PATH}/Dockerfile  -t ${PROJECT_NAME}:${VERSION} .'
+            }
+        }
+        stage('docker-start') {
+			steps {
+				sh 'docker-compose up -d ${PROJECT_NAME}'
+            }
+        }
     }
   post {
 		always {
@@ -37,6 +39,9 @@ pipeline {
     }
     //环境变量
   environment {
-    MODULE_PATH = 'fly-home-common'
+		MODULE_PATH = 'fly-home-common'
+    PROJECT_NAME = 'flyhome-order'
+    VERSION = '2.4.1'
+    PATH= 'fly-home-order/fly-home-order-server'
   }
 }
\ No newline at end of file
diff --git a/JenkinsfileCopy b/JenkinsfileCopy
new file mode 100644
index 0000000..91b6ba6
--- /dev/null
+++ b/JenkinsfileCopy
@@ -0,0 +1,45 @@
+pipeline {
+    /* 声明式流水线内容 */
+    agent any
+
+     stages {
+		stage('打包jar..........') {
+			steps {
+				echo '打包中...'
+                sh 'pwd'
+        		sh '/apache-maven-3.9.11/bin/mvn -version'
+        		sh '/apache-maven-3.9.11/bin/mvn clean package'
+        		sh 'cp ${PATH}/target/*.jar .'
+                echo '打包Success...'
+            }
+        }
+        stage('docker-Build') {
+			steps {
+				sh 'docker build -f ${PATH}/Dockerfile  -t ${PROJECT_NAME}:${VERSION} .'
+            }
+        }
+        stage('docker-start') {
+			steps {
+				sh 'docker-compose up -d ${PROJECT_NAME}'
+            }
+        }
+    }
+  post {
+		always {
+			echo 'I will always say Hello again!'
+        }
+        success {
+			echo 'Pipeline succeeded!'
+        }
+        failure {
+			echo 'Pipeline failed!'
+        }
+    }
+    //环境变量
+  environment {
+    MODULE_PATH = 'fly-home-common'
+    PROJECT_NAME = 'flyhome-order'
+    VERSION = '2.4.1'
+    PATH= 'fly-home-order/fly-home-order-server'
+  }
+}
\ No newline at end of file