File tree Expand file tree Collapse file tree 2 files changed +31
-2
lines changed
Expand file tree Collapse file tree 2 files changed +31
-2
lines changed Original file line number Diff line number Diff line change 1+ def p = [:]
2+ node {
3+ checkout scm
4+ p = readProperties interpolate : true , file : ' ci/pipeline.properties'
5+ }
6+
17pipeline {
28 agent none
39
@@ -33,7 +39,7 @@ pipeline {
3339 steps {
3440 script {
3541 docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
36- docker. image(' openjdk:17-bullseye ' ). inside(' -u root -v /var/run/ docker.sock:/var/run/docker.sock -v /usr/bin/ docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home ' ) {
42+ docker. image(p[ ' docker.java.lts.image ' ] ). inside(p[ ' docker.java.inside. docker' ] ) {
3743 sh " docker login --username ${ DOCKER_HUB_USR} --password ${ DOCKER_HUB_PSW} "
3844 sh ' PROFILE=ci ci/test.sh'
3945 sh " ci/clean.sh"
@@ -63,7 +69,7 @@ pipeline {
6369 steps {
6470 script {
6571 docker. withRegistry(' ' , ' hub.docker.com-springbuildmaster' ) {
66- docker. image(' openjdk:17-bullseye ' ). inside(' -v $HOME:/tmp/jenkins-home ' ) {
72+ docker. image(p[ ' docker.java.main.image ' ] ). inside(p[ ' docker.java.inside.basic ' ] ) {
6773 sh ' MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-r2dbc-non-root ' +
6874 ' -Dartifactory.server=https://repo.spring.io ' +
6975 " -Dartifactory.username=${ ARTIFACTORY_USR} " +
Original file line number Diff line number Diff line change 1+ # Java versions
2+ java.main.tag =17.0.2_8-jdk
3+
4+ # Docker container images - standard
5+ docker.java.main.image =eclipse-temurin:${java.main.tag}
6+
7+ # Supported versions of MongoDB
8+ docker.mongodb.4.4.version =4.4.4
9+ docker.mongodb.5.0.version =5.0.3
10+
11+ # Supported versions of Redis
12+ docker.redis.6.version =6.2.4
13+
14+ # Supported versions of Cassandra
15+ docker.cassandra.3.version =3.11.11
16+
17+ # Docker environment settings
18+ docker.java.inside.basic =-v $HOME:/tmp/jenkins-home
19+ docker.java.inside.docker =-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
20+
21+ # Credentials
22+ docker.registry =
23+ docker.credentials =hub.docker.com-springbuildmaster
You can’t perform that action at this time.
0 commit comments