Skip to content

Commit f3a7ef9

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #2413
1 parent e6b844a commit f3a7ef9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Jenkinsfile

+5-5
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.docker']) {
3939
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
4040
sh 'PROFILE=all-dbs ci/test.sh'
@@ -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.11.image']).inside(p['docker.java.inside.basic']) {
6868
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'
6969
}
@@ -82,7 +82,7 @@ pipeline {
8282
}
8383
steps {
8484
script {
85-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
85+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
8686
docker.image(p['docker.java.15.image']).inside(p['docker.java.inside.basic']) {
8787
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'
8888
}
@@ -111,7 +111,7 @@ pipeline {
111111

112112
steps {
113113
script {
114-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
114+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
115115
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
116116
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
117117
'-Dartifactory.server=https://repo.spring.io ' +
@@ -141,7 +141,7 @@ pipeline {
141141

142142
steps {
143143
script {
144-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
144+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
145145
docker.image(p['docker.java.main.image']).inside('-v $HOME:/tmp/jenkins-home') {
146146
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
147147
'-Dartifactory.server=https://repo.spring.io ' +

0 commit comments

Comments
 (0)