COPY --from=0

src/org/qg/docker_new/StageBucketTke.groovy

@@ -21,11 +21,13 @@ def contextMkdir(key) {
 def imageTag(harborGroup,k8sSystemName,safeBranchName,tagName,imageType){
 	def imageTag4_4=[:] 
 	imageTag4_4["harborHost"]="http://192.168.4.4"
-	if(imageType=="test"){
-		imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
-	}else{
-		imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
-	}
+	imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
+	imageTag4_4["imageTagCode"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
+	// if(imageType=="test"){
+	// 	imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tke${safeBranchName}-${tagName}"
+	// }else{
+	// 	imageTag4_4["imageTag"] = "192.168.4.4/${harborGroup}/${k8sSystemName}:tkeCode${safeBranchName}-${tagName}"
+	// }
 	return [ imageTag4_4 ]
 }
 
@@ -549,6 +551,7 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
 	//systemName == originSystemName
 	def harbor_host = imageTagInfo["harborHost"]
 	def imageTag = imageTagInfo["imageTag"]
+	def imageTagCode = imageTagInfo["imageTagCode"]
 
 	stage('Docker Build And Push') {
 		withDockerRegistry([credentialsId: 'harbor-qajenkins', url: harbor_host]) {
@@ -561,6 +564,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
 			args += "--build-arg BRANCH_NAME=${branchName} "
 			args += "--build-arg SAFE_SYSTEM_NAME=${systemName} "
 			args += "--build-arg BUILD_SCHEMA=${build_schema} "
+			args += "--build-arg FROM_IMAGE=${imageTagCode} "
+			def image = docker.build(imageTag)
+			image.push()
 			def image = docker.build(imageTag, "${args} ${contextDir}")
 		    image.push()