Skip to content

G
global-jenkinsfile
Commit 4efa932d authored by wentao.suo's avatar wentao.suo
Browse files
Options

fffff

parent fa690a4e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/org/qg/docker_new/StageBucket.groovy
View file @ 4efa932d
...@@ -369,7 +369,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){ ...@@ -369,7 +369,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
} }
} }
def dockerMake(buildNumber,systemName,branchName,cluster,timeStemp){ def dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp){
withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) { withDockerRegistry([credentialsId: 'harbor-qajenkins', url: "http://192.168.4.36"]) {
......
vars/qgDockerPiplineWithDockerSlave.groovy
View file @ 4efa932d
...@@ -65,8 +65,8 @@ def call(body) { ...@@ -65,8 +65,8 @@ def call(body) {
_utils.beautyEcho("build over", "info") _utils.beautyEcho("build over", "info")
stage('make docker image') { stage('make docker image') {
_utils.beautyEcho("make docker image", "stage") _utils.beautyEcho("make docker image", "stage")
imageTag = imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp) imageTag = _stage.imageTag(harborGroup,k8sSystemName,safeBranchName,timeStemp)
_stage.dockerMake(buildNumber,systemName,branchName,cluster,timeStemp) _stage.dockerMake(imageTag,buildNumber,systemName,branchName,cluster,timeStemp)
} }
......
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