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>
diff --git a/hv-collector-dcae-app-simulator/Dockerfile b/hv-collector-dcae-app-simulator/Dockerfile
index 55bf645..955cc8e 100644
--- a/hv-collector-dcae-app-simulator/Dockerfile
+++ b/hv-collector-dcae-app-simulator/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"
@@ -10,7 +10,11 @@
&& apt-get clean
WORKDIR /opt/ves-hv-dcae-app-simulator
-ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.simulators.dcaeapp.MainKt"]
+ENTRYPOINT ["./run-java.sh", "run"]
+COPY target/docker-extra/run-java/run-java.sh ./
+
+ENV JAVA_MAIN_CLASS=org.onap.dcae.collectors.veshv.simulators.dcaeapp.MainKt
+
COPY target/libs/external/* ./
COPY target/libs/internal/* ./
COPY target/hv-collector-dcae-app-simulator-*.jar ./