tomcat

judasn · judasn · commit fc459e8e4cb3 · 2018-10-16T16:48:21.000+08:00
diff --git a/markdown-file/Jenkins-Install-And-Settings.md b/markdown-file/Jenkins-Install-And-Settings.md
@@ -549,7 +549,7 @@ pipeline {
     inDockerAndJavaPort = "8081"
     inHostLogPath = "/data/docker/logs/${dockerContainerName}/${env.BUILD_NUMBER}"
     inDockerLogPath = "/data/logs"
-    dockerRunParam = "--name ${dockerContainerName} -v /etc/hosts:/etc/hosts -v ${inHostLogPath}:${inDockerLogPath} --restart=always  -p ${inHostPort}:${inDockerAndJavaPort}"
+    dockerRunParam = "--name=${dockerContainerName} --hostname=${dockerContainerName} -v /etc/hosts:/etc/hosts -v ${inHostLogPath}:${inDockerLogPath} --restart=always  -p ${inHostPort}:${inDockerAndJavaPort}"
   }
   
   /*=======================================常修改变量-end=======================================*/
@@ -673,7 +673,7 @@ pipeline {
     inDockerAndJavaPort = "8081"
     inHostLogPath = "/data/docker/logs/${dockerContainerName}/${env.BUILD_NUMBER}"
     inDockerLogPath = "/data/logs"
-    dockerRunParam = "--name ${dockerContainerName} -v /etc/hosts:/etc/hosts -v ${inHostLogPath}:${inDockerLogPath} --restart=always  -p ${inHostPort}:${inDockerAndJavaPort}"
+    dockerRunParam = "--name=${dockerContainerName} --hostname=${dockerContainerName} -v /etc/hosts:/etc/hosts -v ${inHostLogPath}:${inDockerLogPath} --restart=always  -p ${inHostPort}:${inDockerAndJavaPort}"
   }
   
   /*=======================================常修改变量-end=======================================*/
@@ -754,6 +754,8 @@ pipeline {
         sh """
             docker -H ${projectDockerDaemon} pull ${dockerImageName}
             
+            docker -H ${projectDockerDaemon} stop ${dockerContainerName} | true
+            
             docker -H ${projectDockerDaemon} rm -f ${dockerContainerName} | true
             
             docker -H ${projectDockerDaemon} run -d  ${dockerRunParam} ${dockerImageName}
