Remove Docker Registry login.

jxblum · jxblum · commit 6f65269eed28 · 2022-05-16T10:12:09.000-07:00
Closes spring-projects#2633.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -34,10 +34,8 @@ pipeline {
 			}
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
 					}
 				}
 			}
@@ -61,10 +59,8 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
-								}
+							docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {
+								sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
 							}
 						}
 					}
@@ -80,10 +76,8 @@ pipeline {
 					}
 					steps {
 						script {
-							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-								docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
-									sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
-								}
+							docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {
+								sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'
 							}
 						}
 					}
@@ -109,17 +103,15 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.staging-repository=libs-snapshot-local " +
-									"-Dartifactory.build-name=spring-data-commons " +
-									"-Dartifactory.build-number=${BUILD_NUMBER} " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
+								'-Dartifactory.server=https://repo.spring.io ' +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.staging-repository=libs-snapshot-local " +
+								"-Dartifactory.build-name=spring-data-commons " +
+								"-Dartifactory.build-number=${BUILD_NUMBER} " +
+								'-Dmaven.test.skip=true clean deploy -U -B'
 					}
 				}
 			}
@@ -139,15 +131,13 @@ pipeline {
 
 			steps {
 				script {
-					docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
-						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
-									'-Dartifactory.server=https://repo.spring.io ' +
-									"-Dartifactory.username=${ARTIFACTORY_USR} " +
-									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
-									"-Dartifactory.distribution-repository=temp-private-local " +
-									'-Dmaven.test.skip=true clean deploy -U -B'
-						}
+					docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +
+								'-Dartifactory.server=https://repo.spring.io ' +
+								"-Dartifactory.username=${ARTIFACTORY_USR} " +
+								"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+								"-Dartifactory.distribution-repository=temp-private-local " +
+								'-Dmaven.test.skip=true clean deploy -U -B'
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,8 @@ pipeline {`
`34`	`34`	`}`
`35`	`35`	`steps {`
`36`	`36`	`script {`
`37`		`- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
`38`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`39`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`40`		`- }`
	`37`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`38`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`41`	`39`	`}`
`42`	`40`	`}`
`43`	`41`	`}`
`@@ -61,10 +59,8 @@ pipeline {`
`61`	`59`	`}`
`62`	`60`	`steps {`
`63`	`61`	`script {`
`64`		`- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
`65`		`- docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {`
`66`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`67`		`- }`
	`62`	`+ docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.basic']) {`
	`63`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`68`	`64`	`}`
`69`	`65`	`}`
`70`	`66`	`}`
`@@ -80,10 +76,8 @@ pipeline {`
`80`	`76`	`}`
`81`	`77`	`steps {`
`82`	`78`	`script {`
`83`		`- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
`84`		`- docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {`
`85`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`86`		`- }`
	`79`	`+ docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.basic']) {`
	`80`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list verify -Dsort -U -B'`
`87`	`81`	`}`
`88`	`82`	`}`
`89`	`83`	`}`
`@@ -109,17 +103,15 @@ pipeline {`
`109`	`103`
`110`	`104`	`steps {`
`111`	`105`	`script {`
`112`		`- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
`113`		`- docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
`114`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +`
`115`		`- '-Dartifactory.server=https://repo.spring.io ' +`
`116`		`- "-Dartifactory.username=${ARTIFACTORY_USR} " +`
`117`		`- "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`118`		`- "-Dartifactory.staging-repository=libs-snapshot-local " +`
`119`		`- "-Dartifactory.build-name=spring-data-commons " +`
`120`		`- "-Dartifactory.build-number=${BUILD_NUMBER} " +`
`121`		`- '-Dmaven.test.skip=true clean deploy -U -B'`
`122`		`- }`
	`106`	`+ docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {`
	`107`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +`
	`108`	`+ '-Dartifactory.server=https://repo.spring.io ' +`
	`109`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`110`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`111`	`+ "-Dartifactory.staging-repository=libs-snapshot-local " +`
	`112`	`+ "-Dartifactory.build-name=spring-data-commons " +`
	`113`	`+ "-Dartifactory.build-number=${BUILD_NUMBER} " +`
	`114`	`+ '-Dmaven.test.skip=true clean deploy -U -B'`
`123`	`115`	`}`
`124`	`116`	`}`
`125`	`117`	`}`
`@@ -139,15 +131,13 @@ pipeline {`
`139`	`131`
`140`	`132`	`steps {`
`141`	`133`	`script {`
`142`		`- docker.withRegistry(p['docker.registry'], p['docker.credentials']) {`
`143`		`- docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {`
`144`		`- sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +`
`145`		`- '-Dartifactory.server=https://repo.spring.io ' +`
`146`		`- "-Dartifactory.username=${ARTIFACTORY_USR} " +`
`147`		`- "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
`148`		`- "-Dartifactory.distribution-repository=temp-private-local " +`
`149`		`- '-Dmaven.test.skip=true clean deploy -U -B'`
`150`		`- }`
	`134`	`+ docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {`
	`135`	`+ sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute ' +`
	`136`	`+ '-Dartifactory.server=https://repo.spring.io ' +`
	`137`	`+ "-Dartifactory.username=${ARTIFACTORY_USR} " +`
	`138`	`+ "-Dartifactory.password=${ARTIFACTORY_PSW} " +`
	`139`	`+ "-Dartifactory.distribution-repository=temp-private-local " +`
	`140`	`+ '-Dmaven.test.skip=true clean deploy -U -B'`
`151`	`141`	`}`
`152`	`142`	`}`
`153`	`143`	`}`