ffff

src/org/qg/docker_new/StageBucket.groovy

@@ -289,8 +289,8 @@ def update_microservice(namespace, name, image, tier) {
       requestBody:"""{
         "namespace":"${namespace}",
         "name":"${name}",
-		"image":"${image}",
-		"tier":"${tier}"
+				"image":"${image}",
+				"tier":"${tier}"
       }""",
       url:dest_url
 	
@@ -369,14 +369,14 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
 	}
 }
 
-def dockerMake(buildNumber,systemName,branchName,cluster,harborGroup,k8sSystemName,safeBranchName,timeStemp){
-	imageTag = imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
+def dockerMake(buildNumber,systemName,branchName,cluster,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}"
 		echo build_schema
-		def image = docker.build(imageTag, "--build-arg BUILD_SCHEMA=${build_schema} ${contextDir}")
+		def image = docker.build(imageTag, "--build-arg SYSTEM_NAME=${systemName} --build-arg BUILD_SCHEMA=${build_schema} ${contextDir}")
     image.push()
 
     if (branchName == "master" || branchName == "master--master") {

vars/qgDockerPiplineWithDockerSlave.groovy

@@ -64,16 +64,17 @@ def call(body) {
 					withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
 						_utils.beautyEcho("build over", "info")				
 						stage('make docker image') {
-							_utils.beautyEcho("make docker image", "stage")			
-							_stage.dockerMake(buildNumber,systemName,branchName,cluster,harborGroup,k8sSystemName,safeBranchName,timeStemp)
+							_utils.beautyEcho("make docker image", "stage")		
+							imageTag = imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)	
+							_stage.dockerMake(buildNumber,systemName,branchName,cluster,timeStemp)
 								
 						}	
 							
 						stage('Deploy To K8s Cluster'){
 							_utils.beautyEcho("Deploy To K8s Cluster", "stage")		
-							 
+							_utils.beautyEcho("Deploy image: ${imageTag} to:${namespace}", "info")						
 							_stage.deploy(namespace, systemName, imageTag, config.tier, isDeploy)
-
+							
 							
 														
 						}