Skip to content

Commit 7b7dfe5

Browse files
committed
Use Docker in Docker build setup.
See #2381
1 parent f69b78c commit 7b7dfe5

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
@@ -30,9 +30,9 @@ pipeline {
3030
steps {
3131
script {
3232
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
33-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
33+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
3434
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
35-
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
35+
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build clean dependency:list verify -Dsort -B"
3636
}
3737
}
3838
}
@@ -60,9 +60,9 @@ pipeline {
6060
steps {
6161
script {
6262
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
63-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
63+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
6464
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
65-
"./mvnw -s settings.xml clean dependency:list verify -Dsort -B"
65+
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build clean dependency:list verify -Dsort -B"
6666
}
6767
}
6868
}
@@ -83,15 +83,17 @@ pipeline {
8383
steps {
8484
script {
8585
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
86-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
86+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
8787
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
8888
"./mvnw -s settings.xml -Pci,artifactory " +
89+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
8990
"-Dartifactory.server=${p['artifactory.url']} " +
9091
"-Dartifactory.username=${ARTIFACTORY_USR} " +
9192
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
9293
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
9394
"-Dartifactory.build-name=spring-data-build " +
9495
"-Dartifactory.build-number=spring-data-build-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
96+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-build " +
9597
"-Dmaven.test.skip=true clean deploy -B -U"
9698
}
9799
}

0 commit comments

Comments
 (0)