From 3fb8c57dfac9feaaf8e6f67e3abbd9e0df0f38e1 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 22 Feb 2022 10:31:40 +0100 Subject: [PATCH] Polishing. See #2268 --- ci/openjdk17-redis-6.2/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ci/openjdk17-redis-6.2/Dockerfile b/ci/openjdk17-redis-6.2/Dockerfile index 09f9ad25d..b983e39fb 100644 --- a/ci/openjdk17-redis-6.2/Dockerfile +++ b/ci/openjdk17-redis-6.2/Dockerfile @@ -1,12 +1,16 @@ -FROM adoptopenjdk/openjdk15:latest +ARG BASE +FROM ${BASE} +# Any ARG statements before FROM are cleared. +ARG REDIS # Copy Spring Data Redis's Makefile into the container COPY ./Makefile / RUN set -eux; \ +# sed -i -e 's/http/https/g' /etc/apt/sources.list ; \ apt-get update ; \ apt-get install -y build-essential ; \ - make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=6.2.1; \ + make work/redis/bin/redis-cli work/redis/bin/redis-server REDIS_VERSION=${REDIS}; \ chmod -R o+rw work; \ apt-get clean; \ rm -rf /var/lib/apt/lists/*;