Skip to content

Commit 67d8e59

Browse files
committed
Use Docker in Docker CI setup.
See #1521
1 parent 34da375 commit 67d8e59

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
@@ -78,11 +78,11 @@ pipeline {
7878
steps {
7979
script {
8080
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
81-
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
81+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
8282
sh 'mkdir -p /tmp/jenkins-home'
8383
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
8484
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
85-
"./mvnw -s settings.xml -Pci,external-cassandra " +
85+
"./mvnw -s settings.xml -Pci,external-cassandra -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-cassandra " +
8686
"clean dependency:list verify -Dsort -U -B"
8787
}
8888
}
@@ -111,11 +111,11 @@ pipeline {
111111
steps {
112112
script {
113113
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
114-
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside('-v $HOME:/tmp/jenkins-home') {
114+
docker.image("springci/spring-data-with-cassandra-3.11:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
115115
sh 'mkdir -p /tmp/jenkins-home'
116116
sh 'JAVA_HOME=/opt/java/openjdk8 /opt/cassandra/bin/cassandra -R &'
117117
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
118-
"./mvnw -s settings.xml -Pci,external-cassandra " +
118+
"./mvnw -s settings.xml -Pci,external-cassandra -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-cassandra " +
119119
"clean dependency:list verify -Dsort -U -B"
120120
}
121121
}
@@ -144,16 +144,18 @@ pipeline {
144144
steps {
145145
script {
146146
docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
147-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
147+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
148148
sh 'mkdir -p /tmp/jenkins-home'
149149
sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
150150
"./mvnw -s settings.xml -Pci,artifactory " +
151+
"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
151152
"-Dartifactory.server=${p['artifactory.url']} " +
152153
"-Dartifactory.username=${ARTIFACTORY_USR} " +
153154
"-Dartifactory.password=${ARTIFACTORY_PSW} " +
154155
"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
155156
"-Dartifactory.build-name=spring-data-cassandra " +
156157
"-Dartifactory.build-number=spring-data-cassandra-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
158+
"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-cassandra " +
157159
"-Dmaven.test.skip=true clean deploy -U -B"
158160
}
159161
}

0 commit comments

Comments
 (0)