ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -234,34 +234,6 @@ def build_luaui( systemName, contextDir) {
      
 }
 
-def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {
-    regex = "[`,./;\\[\\]&<>?:\"()|-]+"
-    
-    k8sSystemName = systemName.replaceAll("_","-")
-    safeBranchName = branchName.replaceAll(regex,"_")
-    defaultSystemName = "project"	
-	  timeStemp = new Date().format("yyyyMMddHHmmss")
-
-    imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
-
-    withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
-        withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
-            def image = docker.build(imageTag, "--build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
-            image.push()
-            
-            if (branchName == "master" || branchName == "master--master") {
-                image.push('latest')
-            }
-                
-        }
-    }
-
-    _utils().beautyEcho("镜像地址:${imageTag}", "info")
-    return imageTag
-}
-
-
-
 @NonCPS
 def jsonParse(def json) {
     new groovy.json.JsonSlurperClassic().parseText(json)
@@ -405,6 +377,32 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
 		}
 }
 
+def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {
+    regex = "[`,./;\\[\\]&<>?:\"()|-]+"
+    
+    k8sSystemName = systemName.replaceAll("_","-")
+    safeBranchName = branchName.replaceAll(regex,"_")
+    defaultSystemName = "project"	
+	  timeStemp = new Date().format("yyyyMMddHHmmss")
+
+    imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
+
+    withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
+        withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
+            def image = docker.build(imageTag, "--build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
+            image.push()
+            
+            if (branchName == "master" || branchName == "master--master") {
+                image.push('latest')
+            }
+                
+        }
+    }
+
+    _utils().beautyEcho("镜像地址:${imageTag}", "info")
+    return imageTag
+}
+
 def clean_images(imageTag,contextDir) {
 	sh "rm -rf ${contextDir}"
 	if (imageTag){