fff

src/org/qg/docker_new/Utils.groovy

@@ -35,8 +35,10 @@ def beautyEcho(content, type) {
             result = content
         break
     }
-
-    echo result
+		
+		ansiColor('xterm') {
+	    echo result
+		}
 }
 
 def copyDockerFiles() {

vars/qgDockerPiplineWithDocer.groovy

@@ -3,7 +3,7 @@
 
 def call(body) {
 	
-		
+	
 		def _stage = new org.qg.docker_new.StageBucket()
 		def _utils = new org.qg.docker_new.Utils()
 	   
@@ -33,86 +33,83 @@ def call(body) {
     body.resolveStrategy = Closure.DELEGATE_FIRST
     body.delegate = config
     body()
-			ansiColor('xterm') {
-		    node {   
+
+    node {   
 			  
-					try { 
-						echo config.buildType
-						stage('prepare') {
-							_utils.beautyEcho("Prepare", "stage")
-							contextDir = _stage.contextMkdir("${systemName}-${timeStemp}")
-							_stage.before_prepare()
-						}
+			try { 
+				echo config.buildType
+				stage('prepare') {
+					_utils.beautyEcho("Prepare", "stage")
+					contextDir = _stage.contextMkdir("${systemName}-${timeStemp}")
+					_stage.before_prepare()
+				}
 									
-						pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
+				pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
 				
-						withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
+				withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
 					
-							stage('checkout & build') {
-								_utils.beautyEcho("checkout & build", "stage")
+					stage('checkout & build') {
+						_utils.beautyEcho("checkout & build", "stage")
 						
-								docker.image(pacegeDockerInfo["images"]).inside(pacegeDockerInfo["args"]){
+						docker.image(pacegeDockerInfo["images"]).inside(pacegeDockerInfo["args"]){
 							
-									project_attr = _stage.project_attr(systemName)
-									gitPath = project_attr["gitPath"]
+							project_attr = _stage.project_attr(systemName)
+							gitPath = project_attr["gitPath"]
 				
-									/*checkout code*/
-									_utils.beautyEcho("checkout", "stage")
-									_stage.checkout(git_path, branchName)
+							/*checkout code*/
+							_utils.beautyEcho("checkout", "stage")
+							_stage.checkout(git_path, branchName)
 									
 									
 						  
-									/*prepare config*/
-									_utils.beautyEcho("prepare config", "stage")
-									_stage.prepare_config(systemName, contextDir)
+							/*prepare config*/
+							_utils.beautyEcho("prepare config", "stage")
+							_stage.prepare_config(systemName, contextDir)
 				
-									/*build*/
-									_utils.beautyEcho("build", "stage")
-									buildCmd =  project_attr["buildCmd"]
-									sh "${buildCmd}"
+							/*build*/
+							_utils.beautyEcho("build", "stage")
+							buildCmd =  project_attr["buildCmd"]
+							sh "${buildCmd}"
 					
-									/*copy files*/
-								  _stage.copy_files(config.buildType,project_attr["jarFilePath"],contextDir)
-								}
-							}
+							/*copy files*/
+						  _stage.copy_files(config.buildType,project_attr["jarFilePath"],contextDir)
+						}
+					}
 										
-							stage('make docker image') {
+					stage('make docker image') {
 					
-								imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
-							  withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
+						imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
+					  withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
 						
-									def build_schema = "BUILD_TIME: ${timeStemp} ,BUILD_NUMBER: ${buildNumber},SYSTEM_NAME: ${systemName},BRANCH_NAME: ${branchName}, CLUSTER: ${cluster}"
+							def build_schema = "BUILD_TIME: ${timeStemp} ,BUILD_NUMBER: ${buildNumber},SYSTEM_NAME: ${systemName},BRANCH_NAME: ${branchName}, CLUSTER: ${cluster}"
 					
-									def image = docker.build(imageTag, "--build-arg BUILD_SHCEMA=build_schema ${contextDir}")
-					        image.push()
+							def image = docker.build(imageTag, "--build-arg BUILD_SHCEMA=build_schema ${contextDir}")
+			        image.push()
       
-					        if (branchName == "master" || branchName == "master--master") {
-				            image.push('latest')
-					        }
+			        if (branchName == "master" || branchName == "master--master") {
+		            image.push('latest')
+			        }
           
-						    }
+				    }
 								
-							}	
+					}	
 							
-						}
+				}
 								 				
-					}catch (err) {
-						try{
+			}catch (err) {
+				try{
 					
-								currentBuild.result = 'FAILED'
-								_utils.beautyEcho(err, "fail")
-							}
-						}catch (err1) {
-							_utils.beautyEcho(err, "fail")
-						}
+					currentBuild.result = 'FAILED'
+					_utils.beautyEcho(err, "fail")
+					
+				}catch (err1) {
+					_utils.beautyEcho(err, "fail")
+				}
 				
-		      }finally{				
-						sh "rm -rf ${contextDir}"
-						_stage.clean_images(imageTag)
-					}
-		    }
+      }finally{				
+				sh "rm -rf ${contextDir}"
+				_stage.clean_images(imageTag)
 			}
-		}
-	}
+    }
 }