From a5aa31540de44fceda21f0f7db4aefc5db188d4d Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 11 Oct 2022 17:11:36 -0700
Subject: [PATCH] Align Jenkins CI build file with ci/pipeline.properties.

Resolves #623.
---
 Jenkinsfile            |  2 +-
 ci/pipeline.properties | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 14c42865..5d005718 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -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"`'
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
index e51b5e84..fe32f74a 100644
--- a/ci/pipeline.properties
+++ b/ci/pipeline.properties
@@ -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=