Testing Jenkins

skoranda · May 31, 2020 · d2efeee · d2efeee
1 parent a72eee1
commit d2efeee
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,10 +34,22 @@ pipeline {
                                       "--build-arg COMANAGE_REGISTRY_VERSION=$version " +
                                       "-f ./$directory/Dockerfile ./$directory"
                       def base_image = docker.build("$image", "$build_arg")
-                      //def comanage_registry_base_image = docker.build("comanage-registry-base:$version-1", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version -f ./comanage-registry-base/Dockerfile ./comanage-registry-base")
-                      //def comanage_registry_internet2_tap_base_image = docker.build("comanage-registry-internet2-tier-base:1", "--no-cache -f ./comanage-registry-internet2-tier-base/Dockerfile ./comanage-registry-internet2-tier-base")
-                      //def comanage_registry_internet2_tap_image = docker.build("comanage-registry", "--no-cache --build-arg COMANAGE_REGISTRY_VERSION=$version --build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 --build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 -f ./comanage-registry-internet2-tier/Dockerfile ./comanage-registry-internet2-tier")
-                      //baseImg.push("$tag")
+
+                      def image = 'comanage-registry-internet2-tier-base:1'
+                      def directory = 'comanage-registry-internet2-tier-base'
+                      def build_arg = '--no-cache ' +
+                                      "-f ./$directory/Dockerfile ./$directory"
+                      def tap_base_image = docker.build("$image", "$build_arg")
+
+                      def image = 'comanage-registry'
+                      def directory = 'comanage-registry-internet2-tier'
+                      def build_arg = '--no-cache ' +
+                                      "--build-arg COMANAGE_REGISTRY_VERSION=$version " + 
+                                      "--build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 " +
+                                      "--build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 " + 
+                                      "-f ./$directory/Dockerfile ./$directory"
+                      def tap_image = docker.build("$image", "$build_arg")
+                      tap_image.push("$tag")
                    }
                }
             }