Skip to content

Commit e099741

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #2541
1 parent 92eedc5 commit e099741

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pipeline {
3535
}
3636
steps {
3737
script {
38-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
38+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
3939
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
4040
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
4141
}
@@ -63,7 +63,7 @@ pipeline {
6363

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

ci/pipeline.properties

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

0 commit comments

Comments
 (0)