Skip to content

Commit 8c92e5b

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #2413
1 parent 5b4b4a3 commit 8c92e5b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Jenkinsfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ pipeline {
3131
}
3232
options { timeout(time: 30, unit: 'MINUTES') }
3333
environment {
34-
DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
34+
DOCKER_HUB = credentials("${p['docker.credentials']}")
3535
ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
3636
}
3737
steps {
3838
script {
39-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
39+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
4040
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4141
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
4242
sh 'PROFILE=all-dbs ci/test.sh'
@@ -66,7 +66,7 @@ pipeline {
6666
}
6767
steps {
6868
script {
69-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
69+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7070
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
7171
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
7272
}
@@ -85,7 +85,7 @@ pipeline {
8585
}
8686
steps {
8787
script {
88-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
88+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
8989
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
9090
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -Dbundlor.enabled=false -U -B'
9191
}
@@ -115,7 +115,7 @@ pipeline {
115115

116116
steps {
117117
script {
118-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
118+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
119119
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
120120
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
121121
'-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)