Commit 48f6d80e authored by tower's avatar tower

fix

parent d0845751
......@@ -78,17 +78,18 @@ def call(body) {
/* 3 */
withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
_utils.beautyEcho("make docker image", "stage")
def _systemName = originSystemName.toLowerCase()
/*def _systemName = originSystemName.toLowerCase()*/
def regex = "[`,./;\\[\\]&<>?:\"()|-]+"
def k8sSystemName = originSystemName.replaceAll("_","-").toLowerCase()
def safeBranchName = originBranchName.replaceAll(regex,"_").toLowerCase()
imageTagInfos = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
for (imageTagInfo in imageTagInfos){
_stage.dockerbuild_and_push(imageTagInfo,buildNumber,_systemName,originBranchName ,cluster,timeStemp,contextDir,branchHashCode)
_stage.dockerbuild_and_push(imageTagInfo,buildNumber,originSystemName,originBranchName ,cluster,timeStemp,contextDir,branchHashCode)
}
_stage.deploy(namespace, _systemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
_stage.deploy(namespace, originSystemName, imageTagInfos[0]["imageTag"], config.tier, isDeploy)
}
/* 4 */
......
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