Align Jenkins CI build file with ci/pipeline.properties.

Resolves #623.
This commit is contained in:
John Blum
2022-10-11 17:11:36 -07:00
parent c175544136
commit a5aa31540d
2 changed files with 6 additions and 6 deletions

2
Jenkinsfile vendored
View File

@@ -37,7 +37,7 @@ pipeline {
}
steps {
script {
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.basic']) {
sh 'rm -Rf `find . -name "BACKUPDEFAULT*"`'
sh 'rm -Rf `find . -name "ConfigDiskDir*"`'
sh 'rm -Rf `find . -name "locator*" | grep -v "src"`'

View File

@@ -4,13 +4,13 @@ java.next.tag=11.0.15_10-jdk
java.lts.tag=17.0.3_7-jdk
# Docker container images - standard
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
docker.java.lts.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
docker.container.image.java.next=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
docker.container.image.java.lts=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.lts.tag}
# Docker environment settings
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
docker.container.inside.env.basic=-u root -v $HOME:/tmp/jenkins-home -v /tmp:/tmp
docker.container.inside.env.full=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /tmp:/tmp -v $HOME:/tmp/jenkins-home
# Credentials
docker.registry=