Commit bd9bc3fb authored by kalvin's avatar kalvin

fixbugs

parent 2fad2b60
...@@ -230,7 +230,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa ...@@ -230,7 +230,7 @@ def dockerbuild_and_push(timeNow, buildNumber, branchName, harborGroup, systemNa
defaultSystemName = "project" defaultSystemName = "project"
imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${buildNumber}" imageTag = "192.168.4.36/${harborGroup}/${k8sSystemName}:${safeBranchName}-${buildNumber}"
withDockerServer([uri: "tcp://192.168.4.96:2375/"]) { withDockerServer([uri: "tcp://192.168.4.96:2375/"]) {
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) { 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}") 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}")
...@@ -295,7 +295,7 @@ def project_attr(systemName) { ...@@ -295,7 +295,7 @@ def project_attr(systemName) {
def update_microservice(namespace, name, image, tier) { def update_microservice(namespace, name, image, tier) {
dest_url = "http://192.168.4.24/api/qahome/update_microservice" dest_url = "http://192.168.4.24/api/qahome/update_microservice"
json_str = '{"person":{"namespace":' + namespace + ',"name":' + name + ',"image":'+ image +',"tier":' + tier + '}' json_str = '{"namespace":' + namespace + ',"name":' + name + ',"image":'+ image +',"tier":' + tier + '}'
echo json_str echo json_str
j = readJSON text:json_str j = readJSON text:json_str
......
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