diff options
| author |   Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-03 13:05:15 +0200 |
|---|---|---|
| committer | Piotr Jaszczyk <piotr.jaszczyk@nokia.com> | 2018-08-13 15:19:36 +0200 |
| commit | 8a2552ac94981cfa18cce551066d9ca4ec668558 (patch) | |
| tree | 2e704490e9f0dd10b37e6bfab09b4e51809783ec /hv-collector-main | |
| parent | 88726d99b07a91495b800d6155d796c634560882 (diff) | |
Reorganize docker build
* Docker is built in "docker" profile
* It is turned on by default
* "mvn install" builds and tags docker image
* "mvn deploy" pushes the image to the registry
* "mvn -DskipDocker ..." skips docker build
* Temporarily use OpenJDK 8 instead of 10 - it require us to
specify additional JVM options for use inside containers on production
hence addition of run-java.sh
Change-Id: Ifa67df4ed7de9f3d300d6f6de999a890486dea24
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Issue-ID: DCAEGEN2-653
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'hv-collector-main')
| -rw-r--r-- | hv-collector-main/Dockerfile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/hv-collector-main/Dockerfile b/hv-collector-main/Dockerfile index 1e5f55f8..8216ac46 100644 --- a/hv-collector-main/Dockerfile +++ b/hv-collector-main/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:10-jre-slim +FROM docker.io/openjdk:8-jre-slim LABEL copyright="Copyright (C) 2018 NOKIA" LABEL license.name="The Apache Software License, Version 2.0" @@ -11,7 +11,11 @@ RUN apt-get update \ && apt-get clean WORKDIR /opt/ves-hv-collector -ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"] +ENTRYPOINT ["./run-java.sh", "run"] +COPY target/docker-extra/run-java/run-java.sh ./ + +ENV JAVA_MAIN_CLASS=org.onap.dcae.collectors.veshv.main.MainKt + COPY target/libs/external/* ./ COPY target/libs/internal/* ./ COPY target/hv-collector-main-*.jar ./ |