diff options
| author |   Przemyslaw Wasala <przemyslaw.wasala@nokia.com> | 2018-11-09 13:52:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-09 13:52:17 +0000 |
| commit | d1abb8c3e7c20495ca8a953b175a9810a5b73671 (patch) | |
| tree | 52fcc7755af6f80928fc7ba8242f6dfd85040e8f | |
| parent | cd8f9089f0679b48589e0a332dfa5facee992ac3 (diff) | |
| parent | fc4abff333f302ee554ba1e6babe083a4c0e0e08 (diff) | |
Merge "Switch to JRE 11 in Dockerfiles"
| -rw-r--r-- | hv-collector-dcae-app-simulator/Dockerfile | 6 | ||||
| -rw-r--r-- | hv-collector-main/Dockerfile | 6 | ||||
| -rw-r--r-- | hv-collector-xnf-simulator/Dockerfile | 6 | ||||
| -rw-r--r-- | pom.xml | 7 |
4 files changed, 6 insertions, 19 deletions
diff --git a/hv-collector-dcae-app-simulator/Dockerfile b/hv-collector-dcae-app-simulator/Dockerfile index 955cc8e6..a561fff7 100644 --- 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 746deb51..8049abca 100644 --- 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 ed9dd9b4..53e126b2 100644 --- 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/* ./ @@ -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> |