Skip to content

Commit ad34d50

Browse files
committed
Polishing.
Extract docker credentials into properties file. See #715
1 parent 6826995 commit ad34d50

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
@@ -38,7 +38,7 @@ pipeline {
3838

3939
steps {
4040
script {
41-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
41+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
4242
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4343
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
4444
sh 'PROFILE=ci ci/test.sh'
@@ -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.next.image']).inside(p['docker.java.inside.docker']) {
7676
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
7777
sh 'PROFILE=ci,java11 ci/test.sh'
@@ -95,7 +95,7 @@ pipeline {
9595

9696
steps {
9797
script {
98-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
98+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
9999
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
100100
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
101101
sh 'PROFILE=ci,java11 ci/test.sh'
@@ -127,7 +127,7 @@ pipeline {
127127

128128
steps {
129129
script {
130-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
130+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
131131
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
132132
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc-non-root ' +
133133
'-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)