Merge "Allow to specify JVM options by means of env-var"

diff --git a/development/docker-compose.yml b/development/docker-compose.yml
index d4c3f1d..36518fe 100644 (file)
--- 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 0170b64..ad7a03d 100644 (file)
--- 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 (executable)
index 0000000..2e8cb0c
--- /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 $@