Commit 3be61dc4 authored by 智勇's avatar 智勇

up

parent 037d4234
...@@ -565,9 +565,9 @@ def dockerbuild_and_push(imageTagInfo,buildNumber,systemName,branchName,cluster, ...@@ -565,9 +565,9 @@ 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 DockerfileCode ${contextDir}") def imageCode = docker.build(imageTagCode, "-f ${contextDir}/DockerfileCode ${contextDir}")
imageCode.push() imageCode.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