up

src/org/qg/docker_new/StageBucketTke.groovy

@@ -557,7 +557,7 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
 		withDockerRegistry([credentialsId: 'harbor-qajenkins', url: harbor_host]) {
 			def build_schema = "BUILD_TIME:${timeStemp}@BUILD_NUMBER:${buildNumber}@SYSTEM_NAME:${systemName}@BRANCH_NAME:${branchName}@CLUSTER:${cluster}"
 			echo build_schema
-			def args = "-f Dockerfile"
+			def args = ""
 			args += "--build-arg BUILD_TIME=${timeStemp} "
 			args += "--build-arg BUILD_NUMBER=${buildNumber} "
 			args += "--build-arg SYSTEM_NAME=${systemName} "
@@ -565,9 +565,9 @@ 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} "
-			def image = docker.build(imageTagCode, "-f DockerfileCode ${contextDir}")
-			image.push()
-			def image = docker.build(imageTag, " ${args} ${contextDir}")
+			def imageCode = docker.build(imageTagCode, "-f DockerfileCode ${contextDir}")
+			imageCode.push()
+			def image = docker.build(imageTag, "-f Dockerfile ${args} ${contextDir}")
 		    image.push()
 
 		    if (branchName == "master" || branchName == "master--master") {