Commit 4ab47a6e authored by kalvin's avatar kalvin

删除注释

parent 28913fed
...@@ -514,31 +514,6 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) { ...@@ -514,31 +514,6 @@ def deploy(namespace, systemName, imageTag, tier, isDeploy) {
} }
} }
/*def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemName, contextDir) {
regex = "[`,./;\\[\\]&<>?:\"()|-]+"
k8sSystemName = systemName.replaceAll("_","-")
safeBranchName = branchName.replaceAll(regex,"_")
defaultSystemName = "project"
timeStemp = new Date().format("yyyyMMddHHmmss")
imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${timeStemp}"
withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
def image = docker.build(imageTag, "--build-arg BUILD_TIME=${timeNow} --build-arg BUILD_NUMBER=${buildNumber} --build-arg SYSTEM_NAME=${systemName} --build-arg BRANCH_NAME=${branchName} --build-arg SAFE_SYSTEM_NAME=${defaultSystemName} ${contextDir}")
image.push()
if (branchName == "master" || branchName == "master--master") {
image.push('latest')
}
}
}
_utils().beautyEcho("镜像地址:${imageTag}", "info")
return imageTag
}*/
def clean_images(imageTag,contextDir) { def clean_images(imageTag,contextDir) {
sh "rm -rf ${contextDir}" sh "rm -rf ${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