Commit 97d0a9ad authored by 智勇's avatar 智勇

docker push增加判断

parent 1d4e8edf
...@@ -538,15 +538,18 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster, ...@@ -538,15 +538,18 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster,
args += "--build-arg SAFE_SYSTEM_NAME=${systemName} " args += "--build-arg SAFE_SYSTEM_NAME=${systemName} "
args += "--build-arg BUILD_SCHEMA=${build_schema} " args += "--build-arg BUILD_SCHEMA=${build_schema} "
args += "--build-arg FROM_IMAGE=${imageTagCode} " args += "--build-arg FROM_IMAGE=${imageTagCode} "
def imageCode = docker.build(imageTagCode, "-f ${contextDir}/Code.Dockerfile ${contextDir}")
imageCode.push()
def image = docker.build(imageTag, "${args} ${contextDir}")
image.push()
if (branchName == "master" || branchName == "master--master") { if(cluster=="pro"){
image.push('latest') 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')
}
}
_utils().beautyEcho("镜像地址:${imageTag}", "info") _utils().beautyEcho("镜像地址:${imageTag}", "info")
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment