Skip to content

Commit be378df

Browse files
christophstroblmp911de
authored andcommitted
Upgrade Docker images to Redis 6.2.
Closes: #1990 Original pull request: #1993.
1 parent c35055d commit be378df

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

Diff for: Jenkinsfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ pipeline {
1414
stages {
1515
stage("Docker images") {
1616
parallel {
17-
stage('Publish OpenJDK 8 + Redis 6.0 docker image') {
17+
stage('Publish OpenJDK 8 + Redis 6.2 docker image') {
1818
when {
1919
anyOf {
20-
changeset "ci/openjdk8-redis-6.0/**"
20+
changeset "ci/openjdk8-redis-6.2/**"
2121
changeset "Makefile"
2222
}
2323
}
@@ -26,17 +26,17 @@ pipeline {
2626

2727
steps {
2828
script {
29-
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .")
29+
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
3030
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
3131
image.push()
3232
}
3333
}
3434
}
3535
}
36-
stage('Publish OpenJDK 11 + Redis 6.0 docker image') {
36+
stage('Publish OpenJDK 11 + Redis 6.2 docker image') {
3737
when {
3838
anyOf {
39-
changeset "ci/openjdk11-redis-6.0/**"
39+
changeset "ci/openjdk11-redis-6.2/**"
4040
changeset "Makefile"
4141
}
4242
}
@@ -45,17 +45,17 @@ pipeline {
4545

4646
steps {
4747
script {
48-
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .")
48+
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .")
4949
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
5050
image.push()
5151
}
5252
}
5353
}
5454
}
55-
stage('Publish OpenJDK 15 + Redis 6.0 docker image') {
55+
stage('Publish OpenJDK 15 + Redis 6.2 docker image') {
5656
when {
5757
anyOf {
58-
changeset "ci/openjdk15-redis-6.0/**"
58+
changeset "ci/openjdk15-redis-6.2/**"
5959
changeset "Makefile"
6060
}
6161
}
@@ -64,7 +64,7 @@ pipeline {
6464

6565
steps {
6666
script {
67-
def image = docker.build("springci/spring-data-openjdk15-with-redis-6.0", "-f ci/openjdk15-redis-6.0/Dockerfile .")
67+
def image = docker.build("springci/spring-data-openjdk15-with-redis-6.2", "-f ci/openjdk15-redis-6.2/Dockerfile .")
6868
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
6969
image.push()
7070
}
@@ -88,7 +88,7 @@ pipeline {
8888
steps {
8989
script {
9090
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
91-
docker.image('springci/spring-data-openjdk8-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
91+
docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
9292
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
9393
}
9494
}
@@ -112,7 +112,7 @@ pipeline {
112112
steps {
113113
script {
114114
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
115-
docker.image('springci/spring-data-openjdk11-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
115+
docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
116116
sh 'PROFILE=java11 ci/test.sh'
117117
}
118118
}
@@ -127,7 +127,7 @@ pipeline {
127127
steps {
128128
script {
129129
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
130-
docker.image('springci/spring-data-openjdk15-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
130+
docker.image('springci/spring-data-openjdk15-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
131131
sh 'PROFILE=java11 ci/test.sh'
132132
}
133133
}

Diff for: ci/openjdk11-redis-6.0/Dockerfile renamed to ci/openjdk11-redis-6.2/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ COPY ./Makefile /
66
RUN set -eux; \
77
apt-get update ; \
88
apt-get install -y build-essential ; \
9-
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
9+
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
1010
chmod -R o+rw work; \
1111
apt-get clean; \
1212
rm -rf /var/lib/apt/lists/*;
13-

Diff for: ci/openjdk15-redis-6.0/Dockerfile renamed to ci/openjdk15-redis-6.2/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ COPY ./Makefile /
66
RUN set -eux; \
77
apt-get update ; \
88
apt-get install -y build-essential ; \
9-
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
9+
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
1010
chmod -R o+rw work; \
1111
apt-get clean; \
1212
rm -rf /var/lib/apt/lists/*;
13-

Diff for: ci/openjdk8-redis-6.0/Dockerfile renamed to ci/openjdk8-redis-6.2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ COPY ./Makefile /
66
RUN set -eux; \
77
apt-get update ; \
88
apt-get install -y build-essential ; \
9-
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
9+
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
1010
chmod -R o+rw work; \
1111
apt-get clean; \
1212
rm -rf /var/lib/apt/lists/*;

0 commit comments

Comments
 (0)