Skip to content

Upgrade Docker images to Redis 6.2 #1993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Upgrade Docker images to Redis 6.2 #1993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
314f043
Prepare issue branch.
christophstrobl Mar 4, 2021
b1a75b3
Give Redis 6.2.1 a try on CI
christophstrobl Mar 4, 2021
f7ca3dc
mess with docker & jenkins
christophstrobl Mar 4, 2021
33bfdb1
Remove 6.0 Dockerfiles
christophstrobl Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ pipeline {
stages {
stage("Docker images") {
parallel {
stage('Publish OpenJDK 8 + Redis 6.0 docker image') {
stage('Publish OpenJDK 8 + Redis 6.2 docker image') {
when {
anyOf {
changeset "ci/openjdk8-redis-6.0/**"
changeset "ci/openjdk8-redis-6.2/**"
changeset "Makefile"
}
}
Expand All @@ -26,17 +26,17 @@ pipeline {

steps {
script {
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.0", "-f ci/openjdk8-redis-6.0/Dockerfile .")
def image = docker.build("springci/spring-data-openjdk8-with-redis-6.2", "-f ci/openjdk8-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
stage('Publish OpenJDK 11 + Redis 6.0 docker image') {
stage('Publish OpenJDK 11 + Redis 6.2 docker image') {
when {
anyOf {
changeset "ci/openjdk11-redis-6.0/**"
changeset "ci/openjdk11-redis-6.2/**"
changeset "Makefile"
}
}
Expand All @@ -45,17 +45,17 @@ pipeline {

steps {
script {
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.0", "-f ci/openjdk11-redis-6.0/Dockerfile .")
def image = docker.build("springci/spring-data-openjdk11-with-redis-6.2", "-f ci/openjdk11-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
}
}
}
stage('Publish OpenJDK 15 + Redis 6.0 docker image') {
stage('Publish OpenJDK 15 + Redis 6.2 docker image') {
when {
anyOf {
changeset "ci/openjdk15-redis-6.0/**"
changeset "ci/openjdk15-redis-6.2/**"
changeset "Makefile"
}
}
Expand All @@ -64,7 +64,7 @@ pipeline {

steps {
script {
def image = docker.build("springci/spring-data-openjdk15-with-redis-6.0", "-f ci/openjdk15-redis-6.0/Dockerfile .")
def image = docker.build("springci/spring-data-openjdk15-with-redis-6.2", "-f ci/openjdk15-redis-6.2/Dockerfile .")
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
image.push()
}
Expand All @@ -88,7 +88,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image('springci/spring-data-openjdk8-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
docker.image('springci/spring-data-openjdk8-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=none LONG_TESTS=true ci/test.sh'
}
}
Expand All @@ -112,7 +112,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image('springci/spring-data-openjdk11-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
docker.image('springci/spring-data-openjdk11-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=java11 ci/test.sh'
}
}
Expand All @@ -127,7 +127,7 @@ pipeline {
steps {
script {
docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
docker.image('springci/spring-data-openjdk15-with-redis-6.0:latest').inside('-v $HOME:/tmp/jenkins-home') {
docker.image('springci/spring-data-openjdk15-with-redis-6.2:latest').inside('-v $HOME:/tmp/jenkins-home') {
sh 'PROFILE=java11 ci/test.sh'
}
}
Expand Down
3 changes: 1 addition & 2 deletions ci/openjdk11-redis-6.0/Dockerfile → ci/openjdk11-redis-6.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;

3 changes: 1 addition & 2 deletions ci/openjdk15-redis-6.0/Dockerfile → ci/openjdk15-redis-6.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;

2 changes: 1 addition & 1 deletion ci/openjdk8-redis-6.0/Dockerfile → ci/openjdk8-redis-6.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY ./Makefile /
RUN set -eux; \
apt-get update ; \
apt-get install -y build-essential ; \
make work/redis/bin/redis-cli work/redis/bin/redis-server; \
make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \
chmod -R o+rw work; \
apt-get clean; \
rm -rf /var/lib/apt/lists/*;
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>2.5.0-SNAPSHOT</version>
<version>2.5.0-GH-1990-SNAPSHOT</version>

<name>Spring Data Redis</name>

Expand Down