Skip to content

Commit 7d0de58

Browse files
gregturnmp911de
authored andcommitted
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 6f49b89 commit 7d0de58

File tree

3 files changed

+41
-7
lines changed

3 files changed

+41
-7
lines changed

Jenkinsfile

+11-4
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

@@ -17,16 +23,17 @@ pipeline {
1723
stage('Publish JDK 17 + Redis 6.2 Docker image') {
1824
when {
1925
anyOf {
20-
changeset "ci/openjdk17-redis-6.2/**"
26+
changeset "ci/openjdk17-redis-6.2/Dockerfile"
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-openjdk17-with-redis-6.2", "-f ci/openjdk17-redis-6.2/Dockerfile .")
36+
def image = docker.build("springci/spring-data-with-redis-6.2:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg REDIS=${p['docker.redis.6.version']} -f ci/openjdk17-redis-6.2/Dockerfile .")
3037
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
3138
image.push()
3239
}
@@ -54,7 +61,7 @@ pipeline {
5461
steps {
5562
script {
5663
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
57-
docker.image('springci/spring-data-openjdk17-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
64+
docker.image('springci/spring-data-openjdk17-with-redis-6.2:${p['java.main.tag']}').inside('-v $HOME:/tmp/jenkins-home') {
5865
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
5966
}
6067
}
@@ -82,7 +89,7 @@ pipeline {
8289
steps {
8390
script {
8491
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
85-
docker.image('openjdk:17-bullseye').inside('-v $HOME:/tmp/jenkins-home') {
92+
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
8693
sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory ' +
8794
'-Dartifactory.server=https://repo.spring.io ' +
8895
"-Dartifactory.username=${ARTIFACTORY_USR} " +

ci/openjdk17-redis-6.2/Dockerfile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
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 /
58

69
RUN set -eux; \
7-
sed -i -e 's/http/https/g' /etc/apt/sources.list ; \
10+
# 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/pipeline.properties

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Java versions
2+
java.main.tag=8u312-b07-jdk
3+
java.next.tag=11.0.13_8-jdk
4+
java.lts.tag=17.0.1_12-jdk
5+
6+
# Docker container images - standard
7+
docker.java.main.image=eclipse-temurin:${java.main.tag}
8+
docker.java.next.image=eclipse-temurin:${java.next.tag}
9+
docker.java.lts.image=eclipse-temurin:${java.lts.tag}
10+
11+
# Supported versions of MongoDB
12+
docker.mongodb.4.0.version=4.0.23
13+
docker.mongodb.4.4.version=4.4.4
14+
docker.mongodb.5.0.version=5.0.3
15+
16+
# Supported versions of Redis
17+
docker.redis.6.version=6.2.4
18+
19+
# Supported versions of Cassandra
20+
docker.cassandra.3.version=3.11.10
21+
22+
# Docker environment settings
23+
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
24+
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)