Skip to content

Commit 4680c66

Browse files
committed
Use Docker in Docker setup for CI.
See #217
1 parent 606aaba commit 4680c66

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Jenkinsfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ pipeline {
3939
steps {
4040
script {
4141
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
42-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
42+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4343
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
44-
"./mvnw -s settings.xml -Pwith-bom-client verify -B -U"
44+
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-bom -Pwith-bom-client verify -B -U"
4545
}
4646
}
4747
}
@@ -68,15 +68,17 @@ pipeline {
6868
steps {
6969
script {
7070
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
71-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
71+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
7272
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
7373
"./mvnw -s settings.xml -Pci,artifactory " +
74+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
7475
"-Dartifactory.server=${p['artifactory.url']} " +
7576
"-Dartifactory.username=${ARTIFACTORY_USR} " +
7677
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
7778
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
7879
"-Dartifactory.build-name=spring-data-bom " +
7980
"-Dartifactory.build-number=spring-data-bom-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
81+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-bom " +
8082
"-Dmaven.test.skip=true clean deploy -U -B"
8183
}
8284
}

0 commit comments

Comments
 (0)