Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Docker images to Redis 6.2.

Browse Source 
Closes: #1990
Original pull request: #1993.
This commit is contained in:
Christoph Strobl
2021-03-04 10:42:26 +01:00
committed by Mark Paluch
parent c35055d4b7
commit be378df152
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Jenkinsfile vendored
View File

@@ -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"
}
}
@@ -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"
}
}
@@ -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"
}
}
@@ -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()
}
@@ -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'
}
}
@@ -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'
}
}
@@ -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'
}
}

3
ci/openjdk11-redis-6.0/Dockerfile → ci/openjdk11-redis-6.2/Dockerfile
View File

@@ -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
ci/openjdk15-redis-6.0/Dockerfile → ci/openjdk15-redis-6.2/Dockerfile
View File

@@ -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
ci/openjdk8-redis-6.0/Dockerfile → ci/openjdk8-redis-6.2/Dockerfile
View File

@@ -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/*;