Commit 0d474a52 authored by 智勇's avatar 智勇

docker build -f

parent ea063029
...@@ -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 image = docker.build(imageTag) def image = docker.build(imageTagCode, "-f DockerfileCode ${contextDir}")
image.push() image.push()
def image = docker.build(imageTag, "${args} ${contextDir}") def image = docker.build(imageTag, "${args} -f Dockerfile ${contextDir}")
image.push() image.push()
if (branchName == "master" || branchName == "master--master") { if (branchName == "master" || branchName == "master--master") {
...@@ -597,10 +597,10 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) { ...@@ -597,10 +597,10 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
} }
def clean_images(imageTag,contextDir) { def clean_images(imageTag,imageTagCode,contextDir) {
sh "rm -rf ${contextDir}" sh "rm -rf ${contextDir}"
if (imageTag){ if (imageTag){
sh "docker rmi -f \$(docker images -q ${imageTag})" sh "docker rmi -f \$(docker images -q ${imageTag})"
sh "docker rmi -f \$(docker images -q ${imageTagCode})"
} }
} }
...@@ -95,7 +95,7 @@ def call(body) { ...@@ -95,7 +95,7 @@ def call(body) {
/* 4 */ /* 4 */
stage('Clean'){ stage('Clean'){
_utils.beautyEcho("Clear Cache Tmp", "stage") _utils.beautyEcho("Clear Cache Tmp", "stage")
_stage.clean_images(imageTagInfos[0]["imageTag"],contextDir) _stage.clean_images(imageTagInfos[0]["imageTag"],imageTagInfos[0]["imageTagCode"],contextDir)
} }
} catch (err) { } catch (err) {
......
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