@@ -31,12 +31,12 @@ pipeline {
31
31
}
32
32
options { timeout(time : 30 , unit : ' MINUTES' ) }
33
33
environment {
34
- DOCKER_HUB = credentials(' hub. docker.com-springbuildmaster ' )
34
+ DOCKER_HUB = credentials(" ${ p[' docker.credentials'] } " )
35
35
ARTIFACTORY = credentials(' 02bd1690-b54f-4c9f-819d-a77cb7a9822c' )
36
36
}
37
37
steps {
38
38
script {
39
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
39
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
40
40
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.docker' ]) {
41
41
sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
42
42
sh ' PROFILE=all-dbs ci/test.sh'
@@ -66,7 +66,7 @@ pipeline {
66
66
}
67
67
steps {
68
68
script {
69
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
69
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
70
70
docker. image(p[' docker.java.next.image' ]). inside(p[' docker.java.inside.basic' ]) {
71
71
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'
72
72
}
@@ -85,7 +85,7 @@ pipeline {
85
85
}
86
86
steps {
87
87
script {
88
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
88
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
89
89
docker. image(p[' docker.java.lts.image' ]). inside(p[' docker.java.inside.basic' ]) {
90
90
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'
91
91
}
@@ -115,7 +115,7 @@ pipeline {
115
115
116
116
steps {
117
117
script {
118
- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
118
+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
119
119
docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
120
120
sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
121
121
' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments