Skip to content

Commit 70e7041

Browse files
committed
Remove Docker Registry login.
Closes #2145.
1 parent eebb9b6 commit 70e7041

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

Jenkinsfile

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,13 @@ pipeline {
3636
}
3737
steps {
3838
script {
39-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
40-
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
41-
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
42-
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
43-
sh 'sleep 10'
44-
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
45-
sh 'sleep 15'
46-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
47-
}
39+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
40+
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
41+
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
42+
sh 'sleep 10'
43+
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
44+
sh 'sleep 15'
45+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
4846
}
4947
}
5048
}
@@ -69,17 +67,15 @@ pipeline {
6967

7068
steps {
7169
script {
72-
docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
73-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
74-
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
75-
'-Dartifactory.server=https://repo.spring.io ' +
76-
"-Dartifactory.username=${ARTIFACTORY_USR} " +
77-
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
78-
"-Dartifactory.staging-repository=libs-snapshot-local " +
79-
"-Dartifactory.build-name=spring-data-rest " +
80-
"-Dartifactory.build-number=${BUILD_NUMBER} " +
81-
'-Dmaven.test.skip=true clean deploy -U -B'
82-
}
70+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
71+
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
72+
'-Dartifactory.server=https://repo.spring.io ' +
73+
"-Dartifactory.username=${ARTIFACTORY_USR} " +
74+
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
75+
"-Dartifactory.staging-repository=libs-snapshot-local " +
76+
"-Dartifactory.build-name=spring-data-rest " +
77+
"-Dartifactory.build-number=${BUILD_NUMBER} " +
78+
'-Dmaven.test.skip=true clean deploy -U -B'
8379
}
8480
}
8581
}

0 commit comments

Comments
 (0)