summaryrefslogtreecommitdiffstats
path: root/demo
diff options
context:
space:
mode:
authorRam Koya <rk541m@att.com>2018-12-14 17:06:04 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-14 17:06:04 +0000
commitfa243918b08f4dc3992aba78833d5982dcd31c0c (patch)
tree6e3aeb004582720e5c9c6bfae0482887319d690a /demo
parentfe4b752ab4c41526c55f2ac3e134b3b072be6ab2 (diff)
parent7470220aa33505fee7b243368c479c5796db24ac (diff)
Merge "update docker images"
Diffstat (limited to 'demo')
-rw-r--r--demo/docker_files/__MsgRtrApi.properties3
-rw-r--r--demo/docker_files/__docker-compose.yml8
2 files changed, 5 insertions, 6 deletions
diff --git a/demo/docker_files/__MsgRtrApi.properties b/demo/docker_files/__MsgRtrApi.properties
index 47293a7..ea6e089 100644
--- a/demo/docker_files/__MsgRtrApi.properties
+++ b/demo/docker_files/__MsgRtrApi.properties
@@ -102,7 +102,7 @@ authentication.adminSecret=fe3cCompound
## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
## which is not always adequate.) You can set this value explicitly here.
##
-#cambria.api.node.identifier=<use-something-unique-to-this-instance>
+cambria.api.node.identifier=message-router
###############################################################################
##
@@ -115,6 +115,7 @@ authentication.adminSecret=fe3cCompound
#metrics.send.cambria.sendEverySeconds=60
cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+consumer.timeout=17
##############################################################################
#100mb
diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index e2fa2e7..94f8d93 100644
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -6,11 +6,11 @@ networks:
com.docker.network.driver.mtu: ${MTU}
services:
zookeeper:
- image: wurstmeister/zookeeper
+ image: nexus3.onap.org:10001/onap/dmaap/zookeeper:1.0.0
ports:
- "2181:2181"
volumes:
- - ./data-zookeeper:/opt/zookeeper-3.4.9/data
+ - ./data-zookeeper:/var/lib/zookeeper/data
logging:
driver: "json-file"
options:
@@ -42,8 +42,6 @@ services:
KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- - ./data-kafka:/kafka
- - ./start-kafka.sh:/start-kafka.sh
logging:
driver: "json-file"
options:
@@ -51,7 +49,7 @@ services:
max-file: "5"
dmaap:
- image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.8
+ image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.9
ports:
- "3904:3904"
- "3905:3905"