Skip to content

Commit e42124b

Browse files
committed
Remove Docker Registry login.
Closes #1248.
1 parent c68edda commit e42124b

File tree

1 file changed

+21
-29
lines changed

1 file changed

+21
-29
lines changed

Jenkinsfile

Lines changed: 21 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,10 @@ pipeline {
3737

3838
steps {
3939
script {
40-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
41-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
42-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
43-
sh "PROFILE=ci,all-dbs ci/test.sh"
44-
sh "ci/clean.sh"
45-
}
40+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
41+
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
42+
sh "PROFILE=ci,all-dbs ci/test.sh"
43+
sh "ci/clean.sh"
4644
}
4745
}
4846
}
@@ -69,12 +67,10 @@ pipeline {
6967

7068
steps {
7169
script {
72-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
73-
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
74-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
75-
sh "PROFILE=ci ci/test.sh"
76-
sh "ci/clean.sh"
77-
}
70+
docker.image(p['docker.java.11.image']).inside(p['docker.java.inside.docker']) {
71+
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
72+
sh "PROFILE=ci ci/test.sh"
73+
sh "ci/clean.sh"
7874
}
7975
}
8076
}
@@ -93,12 +89,10 @@ pipeline {
9389

9490
steps {
9591
script {
96-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
97-
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
98-
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
99-
sh "PROFILE=ci ci/test.sh"
100-
sh "ci/clean.sh"
101-
}
92+
docker.image(p['docker.java.lts.image']).inside(p['docker.java.inside.docker']) {
93+
sh "docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}"
94+
sh "PROFILE=ci ci/test.sh"
95+
sh "ci/clean.sh"
10296
}
10397
}
10498
}
@@ -124,17 +118,15 @@ pipeline {
124118

125119
steps {
126120
script {
127-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
128-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
129-
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-jdbc-non-root ' +
130-
'-Dartifactory.server=https://repo.spring.io ' +
131-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
132-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
133-
"-Dartifactory.staging-repository=libs-snapshot-local " +
134-
"-Dartifactory.build-name=spring-data-jdbc " +
135-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
136-
'-Dmaven.test.skip=true clean deploy -U -B'
137-
}
121+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
122+
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-jdbc-non-root ' +
123+
'-Dartifactory.server=https://repo.spring.io ' +
124+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
125+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
126+
"-Dartifactory.staging-repository=libs-snapshot-local " +
127+
"-Dartifactory.build-name=spring-data-jdbc " +
128+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
129+
'-Dmaven.test.skip=true clean deploy -U -B'
138130
}
139131
}
140132
}

0 commit comments

Comments
 (0)