Switch to JRE 11 in Dockerfiles

Change-Id: I3f8cc792677f01b6f4eeb7cc36822b6a9ed482d9
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-969

diff --git a/hv-collector-dcae-app-simulator/Dockerfile b/hv-collector-dcae-app-simulator/Dockerfile
index 955cc8e..a561fff 100644 (file)
--- a/hv-collector-dcae-app-simulator/Dockerfile
+++ b/hv-collector-dcae-app-simulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/openjdk:8-jre-slim
+FROM docker.io/openjdk:11-jre-slim
 
 LABEL copyright="Copyright (C) 2018 NOKIA"
 LABEL license.name="The Apache Software License, Version 2.0"
@@ -10,10 +10,8 @@ RUN apt-get update \
         && apt-get clean
 
 WORKDIR /opt/ves-hv-dcae-app-simulator
-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
+ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.simulators.dcaeapp.MainKt"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./

diff --git a/hv-collector-main/Dockerfile b/hv-collector-main/Dockerfile
index 746deb5..8049abc 100644 (file)
--- a/hv-collector-main/Dockerfile
+++ b/hv-collector-main/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/openjdk:8-jre-slim
+FROM docker.io/openjdk:11-jre-slim
 
 LABEL copyright="Copyright (C) 2018 NOKIA"
 LABEL license.name="The Apache Software License, Version 2.0"
@@ -10,10 +10,8 @@ RUN apt-get update \
         && apt-get clean
 
 WORKDIR /opt/ves-hv-collector
-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
+ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./

diff --git a/hv-collector-xnf-simulator/Dockerfile b/hv-collector-xnf-simulator/Dockerfile
index ed9dd9b..53e126b 100644 (file)
--- a/hv-collector-xnf-simulator/Dockerfile
+++ b/hv-collector-xnf-simulator/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/openjdk:8-jre-slim
+FROM docker.io/openjdk:11-jre-slim
 
 LABEL copyright="Copyright (C) 2018 NOKIA"
 LABEL license.name="The Apache Software License, Version 2.0"
@@ -10,10 +10,8 @@ RUN apt-get update \
         && apt-get clean
 
 WORKDIR /opt/ves-hv-client-simulator
-ENTRYPOINT ["./run-java.sh", "run"]
-COPY target/docker-extra/run-java/run-java.sh ./
 
-ENV JAVA_MAIN_CLASS=org.onap.dcae.collectors.veshv.simulators.xnf.MainKt
+ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.simulators.xnf.MainKt"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./

diff --git a/pom.xml b/pom.xml
index 983ab3c..ba71a31 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -459,13 +459,6 @@
                                     </image>
                                 </images>
                             </configuration>
-                            <dependencies>
-                                <dependency>
-                                    <groupId>io.fabric8</groupId>
-                                    <artifactId>run-java-sh</artifactId>
-                                    <version>1.2.2</version>
-                                </dependency>
-                            </dependencies>
                         </plugin>
                     </plugins>
                 </pluginManagement>