up

src/org/qg/docker_new/StageBucketTke.groovy

@@ -520,7 +520,7 @@ def build_luaui( systemName, branchName,contextDir) {
 }
 
 
-def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,timeStemp,contextDir,branchHashCode){
+def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,timeStemp,contextDir,branchHashCode,buildType){
 	//systemName == originSystemName
 	def harbor_host = imageTagInfo["harborHost"]
 	def imageTag = imageTagInfo["imageTag"]
@@ -538,18 +538,29 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
 			args += "--build-arg SAFE_SYSTEM_NAME=${systemName} "
 			args += "--build-arg BUILD_SCHEMA=${build_schema} "
 			args += "--build-arg FROM_IMAGE=${imageTagCode} "
-
-			if(cluster=="pro"){
+			if(buildType=="java"){
+				if(cluster=="pro"){
+					def imageCode = docker.build(imageTagCode, "-f ${contextDir}/Code.Dockerfile ${contextDir}")
+					imageCode.push()
+				} else if (cluster=="test") {
+					def image = docker.build(imageTag, "${args} ${contextDir}")
+					image.push()
+
+					if (branchName == "master" || branchName == "master--master") {
+						image.push('latest')
+					}
+				}
+			} else {
 				def imageCode = docker.build(imageTagCode, "-f ${contextDir}/Code.Dockerfile ${contextDir}")
 				imageCode.push()
-			}else if (cluster=="test") {
 				def image = docker.build(imageTag, "${args} ${contextDir}")
-		    	image.push()
+				image.push()
 
-			    if (branchName == "master" || branchName == "master--master") {
-			      image.push('latest')
-			    }
+				if (branchName == "master" || branchName == "master--master") {
+					image.push('latest')
+				}
 			}
+
 			_utils().beautyEcho("镜像地址:${imageTag}", "info")
 		}
 	}

vars/qgDockerPiplineWithDockerSlaveTke.groovy

@@ -79,7 +79,7 @@ def call(body) {
 					imageTagInfos = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
 
 					for	(imageTagInfo in imageTagInfos){
-						_stage.dockerbuild_and_push(imageTagInfo,buildNumber,originSystemName,originBranchName ,cluster,timeStemp,contextDir,branchHashCode)
+						_stage.dockerbuild_and_push(imageTagInfo,buildNumber,originSystemName,originBranchName ,cluster,timeStemp,contextDir,branchHashCode,config.buildType)
 					}
 					_stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
 				}