Skip to content

Commit 523721e

Browse files
committed
Externalize build properties.
By reading a properties file from an external location, it is possible to inject a consistent set of properties from Spring Data Build. This also supports repeatable builds. Closes #2245.
1 parent be616a5 commit 523721e

File tree

4 files changed

+42
-9
lines changed

4 files changed

+42
-9
lines changed

Jenkinsfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
def p = [:]
2+
node {
3+
checkout scm
4+
p = readProperties interpolate: true, file: 'ci/pipeline.properties'
5+
}
6+
17
pipeline {
28
agent none
39

@@ -19,14 +25,15 @@ pipeline {
1925
anyOf {
2026
changeset "ci/openjdk8-redis-6.2/**"
2127
changeset "Makefile"
28+
changeset "ci/pipeline.properties"
2229
}
2330
}
2431
agent { label 'data' }
2532
options { timeout(time: 20, unit: 'MINUTES') }
2633

2734
steps {
2835
script {
29-
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
36+
def image = docker.build("springci/spring-data-with-redis-6.2:jdk8", "--build-arg BASE=${p['docker.java.main.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk8-redis-6.2/Dockerfile .")
3037
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
3138
image.push()
3239
}
@@ -38,14 +45,15 @@ pipeline {
3845
anyOf {
3946
changeset "ci/openjdk16-redis-6.2/**"
4047
changeset "Makefile"
48+
changeset "ci/pipeline.properties"
4149
}
4250
}
4351
agent { label 'data' }
4452
options { timeout(time: 20, unit: 'MINUTES') }
4553

4654
steps {
4755
script {
48-
def image = docker.build("springci/spring-data-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis-6.2/Dockerfile .")
56+
def image = docker.build("springci/spring-data-with-redis-6.2:jdk17", "--build-arg BASE=${p['docker.java.lts.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")
4957
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
5058
image.push()
5159
}
@@ -73,7 +81,7 @@ pipeline {
7381
steps {
7482
script {
7583
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
76-
docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
84+
docker.image("springci/spring-data-with-redis-6.2:jdk8").inside(p['docker.java.inside.basic']) {
7785
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
7886
}
7987
}
@@ -101,7 +109,7 @@ pipeline {
101109
steps {
102110
script {
103111
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
104-
docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
112+
docker.image("springci/spring-data-with-redis-6.2:jdk17").inside(p['docker.java.inside.basic']) {
105113
sh 'PROFILE=java11 ci/test.sh'
106114
}
107115
}
@@ -131,7 +139,7 @@ pipeline {
131139
steps {
132140
script {
133141
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
134-
docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
142+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
135143
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
136144
'-Dartifactory.server=https://repo.spring.io ' +
137145
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/openjdk17-redis-6.2/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
FROM openjdk:17-bullseye
1+
ARG BASE
2+
FROM ${BASE}
3+
# Any ARG statements before FROM are cleared.
4+
ARG REDIS
25

36
# Copy Spring Data Redis's Makefile into the container
47
COPY ./Makefile /
@@ -7,7 +10,7 @@ RUN set -eux; \
710
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
811
apt-get update ; \
912
apt-get install -y build-essential ; \
10-
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \
13+
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=${REDIS}; \
1114
chmod -R o+rw work; \
1215
apt-get clean; \
1316
rm -rf /var/lib/apt/lists/*;

ci/openjdk8-redis-6.2/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
FROM adoptopenjdk/openjdk8:latest
1+
ARG BASE
2+
FROM ${BASE}
3+
# Any ARG statements before FROM are cleared.
4+
ARG REDIS
25

36
# Copy Spring Data Redis's Makefile into the container
47
COPY ./Makefile /
58

69
RUN set -eux; \
710
apt-get update ; \
811
apt-get install -y build-essential ; \
9-
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.4; \
12+
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=${REDIS}; \
1013
chmod -R o+rw work; \
1114
apt-get clean; \
1215
rm -rf /var/lib/apt/lists/*;

ci/pipeline.properties

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Docker container images - standard
2+
docker.java.main.image=adoptopenjdk/openjdk8:latest
3+
docker.java.next.image=adoptopenjdk/openjdk11:latest
4+
docker.java.lts.image=openjdk:17-bullseye
5+
6+
# Supported versions of MongoDB
7+
docker.mongodb.4.0.version=4.0.23
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.10
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

0 commit comments

Comments
 (0)