Commit 55f56c66 authored by wentao.suo's avatar wentao.suo

rff

parent a95bee41
/* /*
docker make pipeline for pipes docker make pipeline for pipes
*/ */
...@@ -23,11 +22,15 @@ def call(body) { ...@@ -23,11 +22,15 @@ def call(body) {
/* def isDeploy = env.IS_DEPLOY*/ /* def isDeploy = env.IS_DEPLOY*/
def buildNumber = env.BUILD_NUMBER // def buildNumber = env.BUILD_NUMBER //
def cluster = env.CLUSTER // dev def cluster = env.CLUSTER // dev
def imageTag =env.IMAGE_TAG // Library/xyqb:master-1213123
def harborHost =env.HARBOR_HOST //192.168.4.4 def harborHost =env.HARBOR_HOST //192.168.4.4
def imageTag =env.IMAGE_TAG // Library/xyqb:master-1213123
def contextDir = _stage.contextMkdir("${gitRepo}-${timeStemp}") def contextDir = _stage.contextMkdir("${gitRepo}-${timeStemp}")
def timeStemp = env.TIMESTEMP def timeStemp = env.TIMESTEMP
def imageTagInfo =[harborHost:"http://${harborHost}",imageTag:"${harborHost}/${imageTag}"]
def branchHashCode def branchHashCode
def imageTagInfo=[] def imageTagInfo=[]
...@@ -54,7 +57,7 @@ def call(body) { ...@@ -54,7 +57,7 @@ def call(body) {
/* 3 */ /* 3 */
withDockerServer([uri: "tcp://192.168.4.96:2375/"]) { withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
_utils.beautyEcho("make docker image", "stage") _utils.beautyEcho("make docker image", "stage")
def imageTagInfo =[harborHost:"http://${harborHost}",imageTag:"${harborHost}/${imageTag}"]
_stage.dockerbuild_and_push(imageTag,buildNumber,systemName,branchName ,cluster,timeStemp,contextDir,branchHashCode) _stage.dockerbuild_and_push(imageTag,buildNumber,systemName,branchName ,cluster,timeStemp,contextDir,branchHashCode)
} }
......
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