From 031c418021b4d2231e8ecb579aea22eed569cf69 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Thu, 10 Sep 2020 10:46:21 -0400 Subject: Update alpine images for jdk11 Updated the docker images to alpine 3.12.0 so that a newer version of openjdk11 would be pulled in. Modified the jdk image to download maven via curl rather than installing it via apk so-as to prevent it from installing java8 as a dependency. Issue-ID: POLICY-2819 Change-Id: Iba4e2448b826ce6abb5df506228c99b9a3676495 Signed-off-by: Jim Hahn --- policy-jdk/alpine/src/main/docker/Dockerfile | 16 +++++++++------- policy-jre/alpine/src/main/docker/Dockerfile | 6 ++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index 9e1b841a..76dc97e9 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -23,7 +23,7 @@ # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk # more details at https://hub.docker.com/_/openjdk -FROM alpine:3.11.3 +FROM alpine:3.12.0 LABEL maintainer="Policy Team" @@ -45,13 +45,15 @@ RUN apk update \ procps \ unzip \ wget \ - zip - -RUN apk add --no-cache \ - maven - -RUN apk add --no-cache \ + zip \ openjdk11 \ + && curl --fail --silent --show-error --retry 3 \ + --output /tmp/apache-maven-3.6.3-bin.tar.gz \ + https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz \ + && tar zxC /usr/share