diff options
| author |   Jakub Dudycz <jakub.dudycz@nokia.com> | 2019-03-13 18:44:31 +0100 |
|---|---|---|
| committer | Jakub Dudycz <jakub.dudycz@nokia.com> | 2019-03-20 14:20:03 +0100 |
| commit | 30afcb56b0c6c4529fdaf68d7b061eee44d68d16 (patch) | |
| tree | 34ce26e44546033fa3572738e8ae59362783147a /development/docker-compose.yml | |
| parent | 189c70a48c24274fb7dd6cb910397a9a93233401 (diff) | |
Remove environment variables and program arguments
- Move all command line program arguments to json file.
- Reorganize configuration classes and the way they are passed through application
- Implement HV VES configuration stream
- Create concrete configuration from partial one
- Modify main HV-VES server starting pipeline
Change-Id: I6cf874b6904ed768e4820b8132f5f760299c929e
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Issue-ID: DCAEGEN2-1340
Diffstat (limited to 'development/docker-compose.yml')
| -rw-r--r-- | development/docker-compose.yml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/development/docker-compose.yml b/development/docker-compose.yml index abd55ab9..85500cbb 100644 --- a/development/docker-compose.yml +++ b/development/docker-compose.yml @@ -73,15 +73,9 @@ services: ports: - "6060:6060" - "6061:6061/tcp" - command: ["--listen-port", "6061", - "--health-check-api-port", "6060", - "--kafka-bootstrap-servers", "message-router-kafka:9092", - "--key-store-password", "onaponap", - "--trust-store-password", "onaponap", - "--first-request-delay", "5", - "--log-level", "DEBUG"] + command: ["--configuration-file /etc/ves-hv/configuration/configuration.json"] environment: - JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml" + JAVA_OPTS: "-Dio.netty.leakDetection.level=paranoid -Dlogback.configurationFile=/etc/ONAP/dcae-hv-ves-collector/logback.xml" CONSUL_HOST: "consul-server" CONFIG_BINDING_SERVICE: "cbs" HOSTNAME: "dcae-hv-ves-collector" @@ -95,7 +89,8 @@ services: - message-router-kafka - config-binding-service volumes: - - ./ssl/:/etc/ves-hv/ + - ./configuration/:/etc/ves-hv/configuration/ + - ./ssl/:/etc/ves-hv/ssl/ - ./logs:/var/log/ONAP/dcae-hv-ves-collector @@ -139,6 +134,7 @@ services: # # Monitoring # + prometheus: image: prom/prometheus ports: |