Testing Jenkins

skoranda · May 31, 2020 · a36f10d · a36f10d
1 parent 6e674ad
commit a36f10d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,6 +11,7 @@ pipeline {
             steps {
                 script {
                     maintainer = maintain()
+                    imagename = imagename()
                     version= registryversion()
                     if(env.BRANCH_NAME == "master") {
                        tag = "latest"
@@ -45,7 +46,7 @@ pipeline {
                                       "-f ./$image_dir/Dockerfile ./$image_dir"
                       def tap_base_image = docker.build("$image_to_build", "$build_arg")
 
-                      image_to_build = 'comanage-registry'
+                      image_to_build = "$maintainer/$imagename"
                       image_dir = 'comanage-registry-internet2-tier'
                       build_arg = '--no-cache ' +
                                       "--build-arg COMANAGE_REGISTRY_VERSION=$version " + 

diff --git a/common.bash b/common.bash
@@ -1,2 +1,3 @@
 maintainer="skoranda"
+imagename="comanage-registry"
 COMANAGE_REGISTRY_VERSION="3.2.5"