@@ -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.basic' ]) {
3939 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B'
4040 }
@@ -61,8 +61,8 @@ pipeline {
6161 }
6262 steps {
6363 script {
64- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
65- docker. image(p[' docker.java.next .image' ]). inside(p[' docker.java.inside.basic' ]) {
64+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
65+ docker. image(p[' docker.java.11 .image' ]). inside(p[' docker.java.inside.basic' ]) {
6666 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
6767 }
6868 }
@@ -80,7 +80,7 @@ pipeline {
8080 }
8181 steps {
8282 script {
83- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
83+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
8484 docker. image(p[' docker.java.15.image' ]). inside(p[' docker.java.inside.basic' ]) {
8585 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pjava11 clean dependency:list test -Dsort -U -B'
8686 }
@@ -109,7 +109,7 @@ pipeline {
109109
110110 steps {
111111 script {
112- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
112+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
113113 docker. image(p[' docker.java.main.image' ]). inside(p[' docker.java.inside.basic' ]) {
114114 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
115115 ' -Dartifactory.server=https://repo.spring.io ' +
@@ -139,7 +139,7 @@ pipeline {
139139
140140 steps {
141141 script {
142- docker. withRegistry(' ' , ' hub. docker.com-springbuildmaster ' ) {
142+ docker. withRegistry(p[ ' docker.registry ' ], p[ ' docker.credentials ' ] ) {
143143 docker. image(' adoptopenjdk/openjdk8:latest' ). inside(' -v $HOME:/tmp/jenkins-home' ) {
144144 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
145145 ' -Dartifactory.server=https://repo.spring.io ' +
0 commit comments