Merge pull request #62 from stakater/dockerimage-parameterize

parameterize docker image name and version
stakater · May 11, 2020 · 2bcad7d · 2bcad7d
2 parents 38759a4 + 8ec1325
commit 2bcad7d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/vars/pushDockerImage.groovy b/vars/pushDockerImage.groovy
@@ -21,15 +21,15 @@ def call(body) {
 
         container(name: 'tools') {
             withCurrentRepo(useToken: true, tokenSecretName: 'GithubToken') { def repoUrl, def repoName, def repoOwner, def repoBranch ->
-                def imageName = repoName.split("dockerfile-").last().toLowerCase()
+                def imageName = config.imageName ? config.imageName : repoName.split("dockerfile-").last().toLowerCase()
                 if (repoOwner.startsWith('stakater-')){
                     repoOwner = 'stakater'
                 }
                 echo "Repo Owner: ${repoOwner}" 
                 def dockerImage = "${dockerRepositoryURL}/${repoOwner.toLowerCase()}/${imageName}"
                 // If image Prefix is passed, use it, else pass empty string to create versions
                 def imagePrefix = config.imagePrefix ? config.imagePrefix + '-' : ''
-                def dockerImageVersion = stakaterCommands.createImageVersionForCiAndCd(repoUrl, imagePrefix, "${env.BRANCH_NAME}", "${env.BUILD_NUMBER}")
+                def dockerImageVersion = config.imageVersion ? config.imageVersion : stakaterCommands.createImageVersionForCiAndCd(repoUrl, imagePrefix, "${env.BRANCH_NAME}", "${env.BUILD_NUMBER}")
 
                 try {
                     stage('Canary Release') {