From 985eef067b863450f57e17201d05ee4c2531475e Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 2 Feb 2022 08:53:05 +0100 Subject: [PATCH] Polishing. Also, externalize docker registry and artifactory credentials. See #1629 --- Jenkinsfile | 4 ++-- ci/pipeline.properties | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 649e4306..e95344ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B' } @@ -49,7 +49,7 @@ pipeline { steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) { sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' + '-Dartifactory.server=https://repo.spring.io ' + diff --git a/ci/pipeline.properties b/ci/pipeline.properties index f8726991..3400e52c 100644 --- a/ci/pipeline.properties +++ b/ci/pipeline.properties @@ -17,3 +17,8 @@ docker.cassandra.3.version=3.11.11 # 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 + + +# Credentials +docker.registry= +docker.credentials=hub.docker.com-springbuildmaster