Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Release initial Oslo CCSDK maven artifacts
[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
..
192d618
100644
(file)
--- a/
alpine/java11/src/main/docker/Dockerfile
+++ b/
alpine/java11/src/main/docker/Dockerfile
@@
-1,9
+1,8
@@
# Base alpine with added packages needed for open ecomp
# 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)
+USER root
-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
ARG HTTP_PROXY
ARG HTTPS_PROXY
@@
-12,4
+11,9
@@
ENV http_proxy ${HTTP_PROXY}
ENV HTTPS_PROXY ${HTTPS_PROXY}
ENV https_proxy ${HTTPS_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
+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