From fa02f313699683aff20bd99ee2416a64a850a81f Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Mon, 14 Sep 2020 13:11:15 -0400 Subject: Update sdnc/apps to use java11 base image Update sdnc/apps to use Java 11 base image Change-Id: I10468121df75931ad1687400457c0e95cd5113ae Issue-ID: SDNC-1242 Signed-off-by: Dan Timoney --- ms/generic-resource-api/src/main/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ms/generic-resource-api/src/main') diff --git a/ms/generic-resource-api/src/main/docker/Dockerfile b/ms/generic-resource-api/src/main/docker/Dockerfile index b4038c4..79dda69 100644 --- a/ms/generic-resource-api/src/main/docker/Dockerfile +++ b/ms/generic-resource-api/src/main/docker/Dockerfile @@ -2,9 +2,8 @@ ## START OF STAGE0 ## FROM @base.image.name@:@ccsdk.docker.version@ AS stage0 -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV LOG_PATH /var/log/onap/sdnc - +USER root # copy deliverables to opt COPY opt /opt @@ -17,7 +16,6 @@ FROM @base.image.name@:@ccsdk.docker.version@ MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) ENV PROJECT_VERSION @project.version@ -ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_HOME /opt/onap/sdnc ENV SDNC_CONFIG_DIR /opt/onap/sdnc/config ENV GRA_JAR @sdnc.gra.jar@ @@ -25,6 +23,8 @@ ENV SVCLOGIC_PROPERTIES /opt/onap/sdnc/config/svclogic.properties ENV SVCLOGIC_DIR /opt/onap/sdnc/svclogic/graphs ENV LOG_PATH /var/log/onap/sdnc +USER root + # Install sudo and IP utilities RUN apk update && apk --no-cache add sudo iputils openssl -- cgit 1.2.3-korg