summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2018-12-12 07:48:42 +0100
committerPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2018-12-13 07:39:25 +0100
commit729d4f1e664faef575d4472bee57c7dab8c3eaba (patch)
treebe7d97d6499da3a9b4eda8eb88231b5f24156dd5
parentccdbec825673153bd57681fa8e1e5a507f4f776b (diff)
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>
-rw-r--r--development/docker-compose.yml2
-rw-r--r--sources/hv-collector-main/Dockerfile4
-rwxr-xr-xsources/hv-collector-main/src/main/scripts/entry.sh5
3 files changed, 8 insertions, 3 deletions
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 $@