From a36f10dd67b22917d9c925d27e307c34bf73d504 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Sun, 31 May 2020 11:19:49 -0500 Subject: [PATCH] Testing Jenkins --- Jenkinsfile | 3 ++- common.bash | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6594c5..39a7853 100644 --- 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 index 941d559..671e2d9 100644 --- a/common.bash +++ b/common.bash @@ -1,2 +1,3 @@ maintainer="skoranda" +imagename="comanage-registry" COMANAGE_REGISTRY_VERSION="3.2.5"