Update to use ONAP standard base images

[ccsdk/distribution.git] / alpine / java11 / src / main / docker / Dockerfile

diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile
index af1297c..d7077f3 100644 (file)
--- a/alpine/java11/src/main/docker/Dockerfile
+++ b/alpine/java11/src/main/docker/Dockerfile
@@ -1,9 +1,7 @@
 # Base alpine with added packages needed for open ecomp
-FROM alpine:3.11.3
+FROM ${base.image}:${base.image.version}
+MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
 
-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
 
@@ -12,4 +10,8 @@ ENV http_proxy  ${HTTP_PROXY}
 ENV HTTPS_PROXY ${HTTPS_PROXY}
 ENV https_proxy ${HTTPS_PROXY}
 
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
\ No newline at end of file
+ENV JAVA_HOME /opt/java/openjdk
+# Add tools needed for OpenDaylight
+USER root
+RUN apk update && apk --no-cache add bash git  maven mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
+USER onap
\ No newline at end of file