From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Wed, 12 Dec 2018 06:48:42 +0000 (+0100)
Subject: Allow to specify JVM options by means of env-var
X-Git-Tag: 1.1.0~85^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=729d4f1e664faef575d4472bee57c7dab8c3eaba;p=dcaegen2%2Fcollectors%2Fhv-ves.git

Allow to specify JVM options by means of env-var

Change-Id: I042e022d650a07804096b397c31abc82a9633089
Issue-ID: DCAEGEN2-1025
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---

diff --git a/development/docker-compose.yml b/development/docker-compose.yml
index d4c3f1d8..36518fef 100644
--- a/development/docker-compose.yml
+++ b/development/docker-compose.yml
@@ -78,7 +78,7 @@ services:
       start_period: 20s
     depends_on:
     - message-router-kafka
-    - consul-server
+    - consul-config
     volumes:
     - ./ssl/:/etc/ves-hv/
 
diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile
index 0170b645..ad7a03d6 100644
--- a/sources/hv-collector-main/Dockerfile
+++ b/sources/hv-collector-main/Dockerfile
@@ -11,9 +11,9 @@ RUN apt-get update \
 
 WORKDIR /opt/ves-hv-collector
 
-ENTRYPOINT ["java", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
+ENTRYPOINT ["entry.sh"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./
-COPY src/main/scripts/healthcheck.sh ./
+COPY src/main/scripts/*.sh ./
 COPY target/hv-collector-main-*.jar ./
diff --git a/sources/hv-collector-main/src/main/scripts/entry.sh b/sources/hv-collector-main/src/main/scripts/entry.sh
new file mode 100755
index 00000000..2e8cb0c5
--- /dev/null
+++ b/sources/hv-collector-main/src/main/scripts/entry.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+java ${JAVA_OPTS:-''} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt $@