From f591a1cef1d65e3cc52cc09eadc94ab88ada581d Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 26 Jul 2022 16:52:31 +0200 Subject: [PATCH] Polishing De-duplicate image names --- Jenkinsfile | 2 +- ci/pipeline.properties | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96341bf7..3dda1381 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { steps { script { - 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 .") + def image = docker.build("${p['docker.build.image.name']}", "--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() } diff --git a/ci/pipeline.properties b/ci/pipeline.properties index aba84bee..786045ef 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -5,7 +5,8 @@ java.main.tag=8u332-b09-jdk 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'} +docker.build.image.name=springci/spring-vault-openjdk8-vault:${java.main.tag}-${docker.vault.version} +docker.image=harbor-repo.vmware.com/dockerhub-proxy-cache/${docker.build.image.name} # Supported versions of MongoDB docker.vault.version=1.11.1