From 71754136622af9fa269f1a06d97a4a31b804b33f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Tue, 1 Sep 2020 12:55:17 +0200 Subject: [PATCH] fix alpine j11 base image MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fix alpine base image with j11 Issue-ID: CCSDK-2715 Signed-off-by: Michael Dürre Change-Id: Ief43e6c6189ee45ae8f86dc059e85890bb60561c --- alpine/java11/src/main/docker/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile index 9a993e91..af1297c0 100644 --- a/alpine/java11/src/main/docker/Dockerfile +++ b/alpine/java11/src/main/docker/Dockerfile @@ -1,7 +1,9 @@ # Base alpine with added packages needed for open ecomp -FROM alpine:3.12 -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) +FROM alpine:3.11.3 +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" + +RUN apk update && apk add --no-cache openjdk11 python3 graphviz unzip rsync nss mysql-client nodejs ARG HTTP_PROXY ARG HTTPS_PROXY @@ -10,7 +12,4 @@ ENV http_proxy ${HTTP_PROXY} ENV HTTPS_PROXY ${HTTPS_PROXY} ENV https_proxy ${HTTPS_PROXY} -ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk -# Add tools needed for OpenDaylight -RUN apk --no-cache add openjdk11 --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - && apk update && apk --no-cache add bash git openjdk11 maven mysql-client nodejs python3 graphviz unzip rsync nss \ No newline at end of file +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk \ No newline at end of file -- 2.16.6