diff options
Diffstat (limited to 'alpine')
| -rw-r--r-- | alpine/java11/pom.xml | 2 | ||||
| -rw-r--r-- | alpine/java11/src/main/docker/Dockerfile | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index e160665c..8370e92a 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -22,6 +22,8 @@ <image.name>onap/ccsdk-alpine-j11-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <base.image>onap/integration-java11</base.image> + <base.image.version>7.1.0</base.image.version> </properties> <build> diff --git a/alpine/java11/src/main/docker/Dockerfile b/alpine/java11/src/main/docker/Dockerfile index af1297c0..d7077f30 100644 --- 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 |