Skip to content

Commit ccfd0e3

Browse files
committed
Use Docker in Docker build setup.
See #2417
1 parent 0d0b26b commit ccfd0e3

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

Jenkinsfile

+7-5
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ pipeline {
3838
steps {
3939
script {
4040
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
41-
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.basic']) {
41+
docker.image("springci/spring-data-with-mongodb-4.4:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
4242
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
4343
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
4444
sh 'sleep 10'
4545
sh 'mongo --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
4646
sh 'sleep 15'
4747
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
48-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
48+
'./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-rest clean dependency:list test -Dsort -U -B -Pit'
4949
}
5050
}
5151
}
@@ -73,14 +73,14 @@ pipeline {
7373
steps {
7474
script {
7575
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
76-
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.basic']) {
76+
docker.image("springci/spring-data-with-mongodb-6.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
7777
sh 'mkdir -p /tmp/mongodb/db /tmp/mongodb/log'
7878
sh 'mongod --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &'
7979
sh 'sleep 10'
8080
sh 'mongosh --eval "rs.initiate({_id: \'rs0\', members:[{_id: 0, host: \'127.0.0.1:27017\'}]});"'
8181
sh 'sleep 15'
8282
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
83-
'./mvnw -s settings.xml clean dependency:list test -Dsort -U -B -Pit'
83+
'./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-rest clean dependency:list test -Dsort -U -B -Pit'
8484
}
8585
}
8686
}
@@ -110,15 +110,17 @@ pipeline {
110110
steps {
111111
script {
112112
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
113-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
113+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
114114
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
115115
"./mvnw -s settings.xml -Pci,artifactory " +
116+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
116117
"-Dartifactory.server=${p['artifactory.url']} " +
117118
"-Dartifactory.username=${ARTIFACTORY_USR} " +
118119
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
119120
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
120121
"-Dartifactory.build-name=spring-data-rest " +
121122
"-Dartifactory.build-number=spring-data-rest-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
123+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-rest " +
122124
"-Dmaven.test.skip=true clean deploy -U -B"
123125
}
124126
}

0 commit comments

Comments
 (0)