Skip to content

Commit 6eca324

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #2541
1 parent 99ade84 commit 6eca324

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Jenkinsfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pipeline {
3434
}
3535
steps {
3636
script {
37-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
37+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3838
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
3939
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
4040
}
@@ -61,7 +61,7 @@ pipeline {
6161
}
6262
steps {
6363
script {
64-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
64+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
6565
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
6666
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
6767
}
@@ -80,7 +80,7 @@ pipeline {
8080
}
8181
steps {
8282
script {
83-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
83+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
8484
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
8585
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list verify -Dsort -U -B'
8686
}
@@ -109,7 +109,7 @@ pipeline {
109109

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

ci/pipeline.properties

+4
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ 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+
# Credentials
27+
docker.registry=
28+
docker.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)