Polishing
De-duplicate image names
This commit is contained in:
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user