Fix of docker version for image

[dcaegen2/collectors/hv-ves.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 33aedec..2590928 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+version: "3.5"
 services:
   zookeeper:
     image: wurstmeister/zookeeper
@@ -28,16 +28,20 @@ services:
       command: ["-server", "-bootstrap", "-ui-dir", "/ui"]
 
   ves-hv-collector:
-    image: nexus3.onap.org:10003/onap/ves-hv-collector:latest
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest
 #    build:
 #      context: hv-collector-main
 #      dockerfile: Dockerfile
     ports:
       - "6060:6060"
       - "6061:6061/tcp"
+    entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid",
+                 "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
     command: ["--listen-port", "6061",
               "--health-check-api-port", "6060",
-              "--config-url", "http://consul:8500/v1/kv/veshv-config"]
+              "--config-url", "http://consul:8500/v1/kv/veshv-config",
+              "--key-store-password", "onaponap",
+              "--trust-store-password", "onaponap"]
     healthcheck:
       test: curl -f http://localhost:6060/health/ready || exit 1
       interval: 10s
@@ -51,25 +55,31 @@ services:
       - ./ssl/:/etc/ves-hv/
 
   xnf-simulator:
-    image: nexus3.onap.org:10003/onap/ves-hv-collector-xnf-simulator
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator
 #    build:
 #      context: hv-collector-xnf-simulator
 #      dockerfile: Dockerfile
     ports:
       - "6062:6062/tcp"
-    command: ["--listen-port", "6062", "--ves-host", "ves-hv-collector", "--ves-port", "6061"]
+    command: ["--listen-port", "6062",
+              "--ves-host", "ves-hv-collector",
+              "--ves-port", "6061",
+              "--key-store-password", "onaponap",
+              "--trust-store-password", "onaponap"]
     depends_on:
       - ves-hv-collector
     volumes:
       - ./ssl/:/etc/ves-hv/
 
   dcae-app-simulator:
-    image: nexus3.onap.org:10003/onap/ves-hv-collector-dcae-simulator
+    image: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator
 #    build:
 #      context: hv-collector-dcae-app-simulator
 #      dockerfile: Dockerfile
     ports:
       - "6063:6063/tcp"
-    command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"]
+    command: ["--listen-port", "6063",
+              "--kafka-bootstrap-servers", "kafka:9092",
+              "--kafka-topics", "HV_VES_PERF3GPP"]
     depends_on:
       - kafka