fix odl patches

[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 9a993e9..192d618 100644 (file)
--- a/alpine/java11/src/main/docker/Dockerfile
+++ b/alpine/java11/src/main/docker/Dockerfile
@@ -1,6 +1,7 @@
 # Base alpine with added packages needed for open ecomp
-FROM alpine:3.12
+FROM ${base.image}:${base.image.version}
 MAINTAINER CCSDK  Team (onap-ccsdk@lists.onap.org)
+USER root
 
 ARG HTTP_PROXY
 ARG HTTPS_PROXY
@@ -10,7 +11,9 @@ ENV http_proxy  ${HTTP_PROXY}
 ENV HTTPS_PROXY ${HTTPS_PROXY}
 ENV https_proxy ${HTTPS_PROXY}
 
-ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk
+ENV JAVA_HOME /opt/java/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
+RUN apk update && apk --no-cache add sudo bash iputils openssl git mysql-client nodejs npm python3 py3-pip graphviz unzip rsync nss
+
+USER onap