From 28949447b122d6e4fa26dee2d167a62c73e5c9a3 Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Tue, 3 Nov 2020 15:31:01 -0600
Subject: [PATCH] DATAREDIS-1220 - Manage JDK 15 container creation.

---
 Jenkinsfile                       | 19 +++++++++++++++++++
 ci/openjdk15-redis-6.0/Dockerfile | 13 +++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 ci/openjdk15-redis-6.0/Dockerfile

diff --git a/Jenkinsfile b/Jenkinsfile
index a82979b98..6048eaca5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,6 +52,25 @@ pipeline {
 						}
 					}
 				}
+				stage('Publish OpenJDK 15 + Redis 6.0 docker image') {
+					when {
+						anyOf {
+							changeset "ci/openjdk15-redis-6.0/**"
+							changeset "Makefile"
+						}
+					}
+					agent { label 'data' }
+					options { timeout(time: 20, unit: 'MINUTES') }
+
+					steps {
+						script {
+							def image = docker.build("springci/spring-data-openjdk15-with-redis-6.0", "-f ci/openjdk15-redis-6.0/Dockerfile .")
+							docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
+								image.push()
+							}
+						}
+					}
+				}
 			}
 		}
 
diff --git a/ci/openjdk15-redis-6.0/Dockerfile b/ci/openjdk15-redis-6.0/Dockerfile
new file mode 100644
index 000000000..8d9064d2d
--- /dev/null
+++ b/ci/openjdk15-redis-6.0/Dockerfile
@@ -0,0 +1,13 @@
+FROM adoptopenjdk/openjdk15:latest
+
+# Copy Spring Data Redis's Makefile into the container
+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; \
+	chmod -R o+rw work; \
+	apt-get clean; \
+	rm -rf /var/lib/apt/lists/*;
+