Commit 2d575b91 authored by wentao.suo's avatar wentao.suo

ffff

parent 48446d8b
...@@ -340,10 +340,11 @@ def getDocketPackageImage(buildType){ ...@@ -340,10 +340,11 @@ def getDocketPackageImage(buildType){
return packageImageInfo return packageImageInfo
} }
def checkAndBuild(dbuildType,systemName,branchName,contextDir){
def pacegeDockerInfo = getDocketPackageImage(config.buildType)
def checkAndBuild(dockerImage,dockerArgs,buildType,systemName,branchName,contextDir){ docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
docker.image(dockerImage).inside(dockerArgs){
/*checkout code*/ /*checkout code*/
_utils().beautyEcho("checkout", "info") _utils().beautyEcho("checkout", "info")
......
...@@ -52,10 +52,10 @@ def call(body) { ...@@ -52,10 +52,10 @@ def call(body) {
stage('checkout & build') { stage('checkout & build') {
_utils.beautyEcho("checkout & build", "stage") _utils.beautyEcho("checkout & build", "stage")
def pacegeDockerInfo = _stage.getDocketPackageImage(config.buildType)
arrSystem = systemName.split("--") arrSystem = systemName.split("--")
for (systemNameSimple in arrSystem) { for (systemNameSimple in arrSystem) {
_stage.checkAndBuild(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"],config.buildType, systemNameSimple, branchName, contextDir) _stage.checkAndBuild(config.buildType, systemNameSimple, branchName, contextDir)
} }
} }
......
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