Spring/spring-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
De-duplicate image names
This commit is contained in:
Mark Paluch
2022-07-26 16:47:31 +02:00
parent 8ed8ba99a2
commit bf89c47f87
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@@ -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']}"
}
}

3
ci/pipeline.properties
View File

@@ -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