diff options
| author |   Piotr Wielebski <piotr.wielebski@nokia.com> | 2018-12-14 08:37:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-14 08:37:08 +0000 |
| commit | da8cdb5ead509c376ef5f8445af6ae045139ab14 (patch) | |
| tree | 705543cfa4e6937bb1f14ffc6595762e51486e06 | |
| parent | 41908970d82f6e8e7f9d2fd7aeb558c551e81d25 (diff) | |
| parent | 729d4f1e664faef575d4472bee57c7dab8c3eaba (diff) | |
Merge "Allow to specify JVM options by means of env-var"
| -rw-r--r-- | development/docker-compose.yml | 2 | ||||
| -rw-r--r-- | sources/hv-collector-main/Dockerfile | 4 | ||||
| -rwxr-xr-x | sources/hv-collector-main/src/main/scripts/entry.sh | 5 |
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 $@ |