Skip to content

Commit abf597c

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

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pipeline {
3838

3939
steps {
4040
script {
41-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
42-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
41+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
42+
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'
4545
sh "ci/clean.sh"
@@ -68,7 +68,7 @@ pipeline {
6868

6969
steps {
7070
script {
71-
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
71+
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
7272
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
7373
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 ' +
7474
'-Dartifactory.server=https://repo.spring.io ' +

0 commit comments

Comments
 (0)