Commit ab3799d8 authored by 智勇's avatar 智勇

up

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