Skip to content

Commit 7681dad

Browse files
committed
Polishing.
Also, externalize docker registry and artifactory credentials. See #1629
1 parent 8a6cf2e commit 7681dad

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Jenkinsfile

+4-4
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
}
@@ -52,7 +52,7 @@ pipeline {
5252
}
5353
steps {
5454
script {
55-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
55+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
5656
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
5757
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
5858
}
@@ -71,7 +71,7 @@ pipeline {
7171
}
7272
steps {
7373
script {
74-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
74+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7575
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
7676
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -B'
7777
}
@@ -94,7 +94,7 @@ pipeline {
9494

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

ci/pipeline.properties

+5
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,8 @@ docker.cassandra.3.version=3.11.10
2222
# Docker environment settings
2323
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
2424
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
25+
26+
27+
# Credentials
28+
docker.registry=
29+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)