Skip to content

Commit dc49d6b

Browse files
committed
Use Docker in Docker CI setup.
See #503
1 parent eff6fc2 commit dc49d6b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Jenkinsfile

+8-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ pipeline {
3737
steps {
3838
script {
3939
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
40-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
40+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
4141
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
42-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
42+
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-ldap clean dependency:list test -Dsort -U -B"
4343
}
4444
}
4545
}
@@ -67,9 +67,9 @@ pipeline {
6767
steps {
6868
script {
6969
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
70-
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.basic']) {
70+
docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
7171
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
72-
"./mvnw -s settings.xml clean dependency:list test -Dsort -U -B"
72+
"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-ldap clean dependency:list test -Dsort -U -B"
7373
}
7474
}
7575
}
@@ -97,16 +97,18 @@ pipeline {
9797
steps {
9898
script {
9999
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
100-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
100+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
101101
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
102102
"./mvnw -s settings.xml -Pci,artifactory " +
103+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
103104
"-Dartifactory.server=${p['artifactory.url']} " +
104105
"-Dartifactory.username=${ARTIFACTORY_USR} " +
105106
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
106107
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
107108
"-Dartifactory.build-name=spring-data-ldap " +
108109
"-Dartifactory.build-number=spring-data-ldap-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
109-
'-Dmaven.test.skip=true clean deploy -U -B '
110+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-ldap " +
111+
"-Dmaven.test.skip=true clean deploy -U -B "
110112
}
111113
}
112114
}

0 commit comments

Comments
 (0)