From bf89c47f8789d42898de435392c040d2b8894e11 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Tue, 26 Jul 2022 16:47:31 +0200
Subject: [PATCH] Polishing

De-duplicate image names
---
 Jenkinsfile            | 6 +++---
 ci/pipeline.properties | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 04e462a5..96341bf7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
 
 					steps {
 						script {
-							def image = docker.build("springci/spring-vault-openjdk8-vault:${p['java.main.tag']}-${p['docker.vault.version']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk8-vault/Dockerfile .")
+							def image = docker.build("${p['docker.image']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg VAULT=${p['docker.vault.version']} -f ci/openjdk8-vault/Dockerfile .")
 							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
@@ -59,7 +59,7 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.image("harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-vault-openjdk8-vault:${p['java.main.tag']}-${p['docker.vault.version']}").inside(p['docker.java.inside.basic']) {
+					docker.image("${p['docker.image']}").inside(p['docker.java.inside.basic']) {
 						sh 'src/test/bash/create_certificates.sh'
 						sh '/opt/vault/vault server -config=$(pwd)/src/test/bash/vault.conf &'
 						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
@@ -78,7 +78,7 @@ pipeline {
 			}
 			agent {
 				docker {
-					image "harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-vault-openjdk17-vault:${p['java.main.tag']}-${p['docker.vault.version']}"
+					image "${p['docker.image']}"
 					args "${p['docker.java.inside.basic']}"
 				}
 			}
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index 9ccdcaf3..aba84bee 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -4,6 +4,9 @@ java.main.tag=8u332-b09-jdk
 # Docker container images - standard
 docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
 
+# Main docker image name using during the CI build
+docker.image=harbor-repo.vmware.com/dockerhub-proxy-cache/springci/spring-vault-openjdk8-vault:${java.main.tag}-${'docker.vault.version'}
+
 # Supported versions of MongoDB
 docker.vault.version=1.11.1