@@ -34,7 +34,7 @@ pipeline {
34
34
}
35
35
steps {
36
36
script {
37
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
37
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
38
38
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
39
39
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
40
40
sh ' PROFILE=all-dbs ci/test.sh'
@@ -63,7 +63,7 @@ pipeline {
63
63
}
64
64
steps {
65
65
script {
66
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
66
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
67
67
docker. image(p[' docker.java.11.image' ]). inside(p[' docker.java.inside.basic' ]) {
68
68
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'
69
69
}
@@ -82,7 +82,7 @@ pipeline {
82
82
}
83
83
steps {
84
84
script {
85
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
85
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
86
86
docker. image(p[' docker.java.15.image' ]). inside(p[' docker.java.inside.basic' ]) {
87
87
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'
88
88
}
@@ -111,7 +111,7 @@ pipeline {
111
111
112
112
steps {
113
113
script {
114
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
114
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
115
115
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
116
116
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
117
117
' -Dartifactory.server=https://repo.spring.io ' +
@@ -141,7 +141,7 @@ pipeline {
141
141
142
142
steps {
143
143
script {
144
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
144
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
145
145
docker. image(p[' docker.java.main.image' ]). inside(' -v $HOME:/tmp/jenkins-home' ) {
146
146
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
147
147
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments