Skip to content

Commit 985eef0

Browse files
committed
Polishing.
Also, externalize docker registry and artifactory credentials. See #1629
1 parent 56d2bf6 commit 985eef0

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipeline {
2828
}
2929
steps {
3030
script {
31-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
31+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3232
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
3333
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -B'
3434
}
@@ -49,7 +49,7 @@ pipeline {
4949

5050
steps {
5151
script {
52-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
52+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5353
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
5454
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
5555
'-Dartifactory.server=https://repo.spring.io ' +

ci/pipeline.properties

+5
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ docker.cassandra.3.version=3.11.11
1717
# Docker environment settings
1818
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
1919
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
20+
21+
22+
# Credentials
23+
docker.registry=
24+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)