From a2d13eae95eee2f3e1669efe8c76f6cbecf641e6 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 4 May 2022 11:43:16 -0700 Subject: [PATCH] Fix Docker container image reference in Deploy Artifacts and Deploy Docs. --- Jenkinsfile | 4 ++-- ci/pipeline.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96b2f3e..8d1cc24 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,7 +63,7 @@ pipeline { } steps { script { - docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { try { sh "ci/deployDocs.sh" @@ -85,7 +85,7 @@ pipeline { } steps { script { - docker.image('openjdk:17-bullseye').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { diff --git a/ci/pipeline.properties b/ci/pipeline.properties index 11a84a8..1cf669e 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -6,7 +6,7 @@ docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/li # Docker Environment Settings 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 +docker.container.inside.env.full=-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp -v $HOME:/tmp/jenkins-home # Credentials artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c