From 9eac30a7dda3d8a75af6a4af51fc4ab4c43a5226 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Mon, 5 Nov 2018 11:32:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=8C=E5=96=84adminapi?=
 =?UTF-8?q?=E7=9A=84jenkins=E6=9E=84=E5=BB=BA=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile         | 31 -------------------------------
 jenkins/Jenkinsfile | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 31 deletions(-)
 delete mode 100644 Jenkinsfile
 create mode 100644 jenkins/Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 5485e4d..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,31 +0,0 @@
-pipeline {
-  agent {
-    docker {
-      image 'maven:3-alpine'
-      args '-v /root/.m2:/root/.m2'
-    }
-
-  }
-  stages {
-    stage('build') {
-      steps {
-        sh 'mvn clean package dockerfile:build dockerfile:push -Dmaven.test.skip=true'
-      }
-    }
-    
-    
-    stage('deploy') {
-    def remote = [:]
-    remote.name = "node-1"
-    remote.host = "130.120.3.231"
-    remote.allowAnyHosts = true
-
-      steps {
-		       withCredentials([sshUserPrivateKey(credentialsId: 'e41b57a4-436a-4617-817c-9e3f25a8a47f', keyFileVariable: 'identity', passphraseVariable: '', usernameVariable: 'userName')]) {
-		        sshCommand remote: remote, command: 'docker stop adminapi'
-		       }
-              sh 'echo deploy'
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile
new file mode 100644
index 0000000..7987068
--- /dev/null
+++ b/jenkins/Jenkinsfile
@@ -0,0 +1,26 @@
+node {
+  checkout scm
+  docker.image('maven:3-alpine').inside('-v /root/.m2:/root/.m2') {
+            stage('build'){
+                sh 'mvn clean package dockerfile:build dockerfile:push -Dmaven.test.skip=true'
+            }
+            
+            stage('deploy'){
+               def remote = [:]
+			   remote.name = "airport-dev"
+               remote.host = "130.120.3.231"
+               remote.allowAnyHosts = true
+
+               withCredentials([sshUserPrivateKey(credentialsId: 'e41b57a4-436a-4617-817c-9e3f25a8a47f', keyFileVariable: 'kfIdentity', passphraseVariable: 'pVariable', usernameVariable: 'userName')]) {
+                 remote.user = userName
+                 remote.identityFile = kfIdentity
+                 
+                 sshCommand remote: remote, command: "docker stop adminapi",sudo: true ,failOnError: false
+                 sshCommand remote: remote, command: "docker rm adminapi",sudo: true ,failOnError: false
+                 sshCommand remote: remote, command: "docker rmi 130.120.3.193/com.gzzn.omms/admin-api:0.0.1-SNAPSHOT",sudo: true ,failOnError: false
+                 sshCommand remote: remote, command: "docker pull 130.120.3.193/com.gzzn.omms/admin-api:0.0.1-SNAPSHOT" ,sudo: true
+                 sshCommand remote: remote, command: "docker run -d -p 91:8080 --name adminapi 130.120.3.193/com.gzzn.omms/admin-api:0.0.1-SNAPSHOT",sudo: true
+               }
+            }
+  }
+}
\ No newline at end of file