Skip to content

Commit 0f29937

Browse files
committed
DATAREDIS-1046 - Upgrade to Redis 6 in CI docker images.
1 parent bdbba08 commit 0f29937

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

Jenkinsfile

+8-8
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 5.0 docker image') {
17+
stage('Publish OpenJDK 8 + Redis 6.0 docker image') {
1818
when {
1919
anyOf {
20-
changeset "ci/openjdk8-redis-5.0/**"
20+
changeset "ci/openjdk8-redis-6.0/**"
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-5.0", "-f ci/openjdk8-redis-5.0/Dockerfile .")
29+
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .")
3030
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
3131
image.push()
3232
}
3333
}
3434
}
3535
}
36-
stage('Publish OpenJDK 11 + Redis 5.0 docker image') {
36+
stage('Publish OpenJDK 11 + Redis 6.0 docker image') {
3737
when {
3838
anyOf {
39-
changeset "ci/openjdk11-redis-5.0/**"
39+
changeset "ci/openjdk11-redis-6.0/**"
4040
changeset "Makefile"
4141
}
4242
}
@@ -45,7 +45,7 @@ pipeline {
4545

4646
steps {
4747
script {
48-
def image = docker.build("springci/spring-data-openjdk11-with-redis-5.0", "-f ci/openjdk11-redis-5.0/Dockerfile .")
48+
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .")
4949
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
5050
image.push()
5151
}
@@ -64,7 +64,7 @@ pipeline {
6464
}
6565
agent {
6666
docker {
67-
image 'springci/spring-data-openjdk8-with-redis-5.0:latest'
67+
image 'springci/spring-data-openjdk8-with-redis-6.0:latest'
6868
label 'data'
6969
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
7070
}
@@ -103,7 +103,7 @@ pipeline {
103103
stage("test: baseline (jdk11)") {
104104
agent {
105105
docker {
106-
image 'springci/spring-data-openjdk11-with-redis-5.0:latest'
106+
image 'springci/spring-data-openjdk11-with-redis-6.0:latest'
107107
label 'data'
108108
args '-v $HOME/.m2:/tmp/jenkins-home/.m2'
109109
}

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
REDIS_VERSION:=6.0.7
15+
REDIS_VERSION:=6.0.8
1616
SPRING_PROFILE?=ci
1717
SHELL=/bin/bash -euo pipefail
1818

0 commit comments

Comments
 (0)