From 102d8c7ed198a6272c942814ca73dff773ae0eea Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 4 Jul 2019 11:40:38 +0100 Subject: [PATCH 1/2] Add a build argument for dockerfile base image version. --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7ef6a67466..5d79937d9d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM openjdk:11-jre-slim +ARG TAG=11-jre-slim +FROM openjdk:${TAG} ARG STYX_VERSION="" ARG STYX_IMAGE=https://github.com/HotelsDotCom/styx/releases/download/${STYX_VERSION}/${STYX_VERSION}-linux-x86_64.zip From ac3245889ab06ba4b08f86ce1516b9c4f02cf9e0 Mon Sep 17 00:00:00 2001 From: Mikko Karjalainen Date: Thu, 4 Jul 2019 16:31:00 +0100 Subject: [PATCH 2/2] Default docker base image to `openjdk:11-jdk`. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5d79937d9d..4c99118538 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -ARG TAG=11-jre-slim +ARG TAG=11-jdk FROM openjdk:${TAG} ARG STYX_VERSION=""