summaryrefslogtreecommitdiffstats
path: root/docker-compose
diff options
context:
space:
mode:
authorPiotr Darosz <piotr.darosz@nokia.com>2018-10-03 14:31:25 +0200
committerPiotr Darosz <piotr.darosz@nokia.com>2018-10-09 10:00:10 +0200
commit5a41037c1c6085febf8d5d9a41f055c9bca3f0d1 (patch)
treed8912faad903afa545224677509f1060287c1f96 /docker-compose
parent3a2e2a602b9aa3677d941f3d5d65ea0dce80b7ab (diff)
Unify DMaaP Data Router image creation
Fix POMs, docker-compose file, use docker plugin, remove Dockerfiles Change-Id: I26c017eceedd30e66841d3a933070112b79ebca1 Issue-ID: DMAAP-836 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com>
Diffstat (limited to 'docker-compose')
-rw-r--r--[-rwxr-xr-x]docker-compose/database/sql_init_01.sql0
-rw-r--r--docker-compose/docker-compose.yml69
-rw-r--r--docker-compose/node_data/node.properties3
-rwxr-xr-xdocker-compose/prov_data/provserver.properties3
4 files changed, 36 insertions, 39 deletions
diff --git a/docker-compose/database/sql_init_01.sql b/docker-compose/database/sql_init_01.sql
index 356a67a9..356a67a9 100755..100644
--- a/docker-compose/database/sql_init_01.sql
+++ b/docker-compose/database/sql_init_01.sql
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index a7b0f982..beb79a0f 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -3,6 +3,7 @@
# * org.onap.dmaap
# * ===========================================================================
# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
# * ===========================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -27,83 +28,77 @@ services:
container_name: datarouter-prov
hostname: dmaap-dr-prov
ports:
- - "443:8443"
- - "8443:8443"
- - "8080:8080"
+ - "443:8443"
+ - "8443:8443"
+ - "8080:8080"
volumes:
- - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
- - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
- - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+ - ./prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
+ - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+ - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
depends_on:
mariadb_container:
condition: service_healthy
healthcheck:
test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
interval: 10s
- timeout: 10s
+ timeout: 30s
retries: 5
- extra_hosts:
- - "dmaap-dr-node:172.100.0.4"
networks:
testing_net:
- ipv4_address: 172.100.0.3
+ aliases:
+ - dmaap-dr-prov
datarouter-node:
image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
container_name: datarouter-node
hostname: dmaap-dr-node
ports:
- - "9443:8443"
- - "9090:8080"
+ - "9443:8443"
+ - "9090:8080"
volumes:
- - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
+ - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
depends_on:
datarouter-prov:
condition: service_healthy
- extra_hosts:
- - "dmaap-dr-prov:172.100.0.3"
networks:
testing_net:
- ipv4_address: 172.100.0.4
+ aliases:
+ - dmaap-dr-node
datarouter-subscriber:
- image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber
- container_name: subscriber-node
- hostname: subscriber.com
- ports:
- - "7070:7070"
- volumes:
- - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
- networks:
- testing_net:
- ipv4_address: 172.100.0.5
+ image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber
+ container_name: subscriber-node
+ hostname: subscriber.com
+ ports:
+ - "7070:7070"
+ volumes:
+ - ./subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
+ networks:
+ testing_net:
+ aliases:
+ - subscriber.com
mariadb_container:
image: mariadb:10.2.14
container_name: mariadb
+ hostname: datarouter-mariadb
ports:
- - "3306:3306"
-# volumes:
-# - ./database/sql_init_01.sql:/docker-entrypoint-initdb.d/sql_init_01.sql
+ - "3306:3306"
environment:
MYSQL_ROOT_PASSWORD: datarouter
MYSQL_DATABASE: datarouter
MYSQL_USER: datarouter
MYSQL_PASSWORD: datarouter
healthcheck:
- test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
+ test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-u", "datarouter", "-pdatarouter", "--silent"]
interval: 10s
timeout: 30s
retries: 5
-
networks:
testing_net:
- ipv4_address: 172.100.0.2
+ aliases:
+ - datarouter-mariadb
networks:
testing_net:
- driver: bridge
- ipam:
- driver: default
- config:
- - subnet: 172.100.0.0/16
+ driver: bridge \ No newline at end of file
diff --git a/docker-compose/node_data/node.properties b/docker-compose/node_data/node.properties
index de38cb6f..03096570 100644
--- a/docker-compose/node_data/node.properties
+++ b/docker-compose/node_data/node.properties
@@ -2,7 +2,8 @@
# ============LICENSE_START==================================================
# * org.onap.dmaap
# * ===========================================================================
-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
# * ===========================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
diff --git a/docker-compose/prov_data/provserver.properties b/docker-compose/prov_data/provserver.properties
index 744bc9ce..c37bd4fb 100755
--- a/docker-compose/prov_data/provserver.properties
+++ b/docker-compose/prov_data/provserver.properties
@@ -3,6 +3,7 @@
# * org.onap.dmaap
# * ===========================================================================
# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
+# * Modifications Copyright (C) 2018 Nokia. All rights reserved.
# * ===========================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -44,6 +45,6 @@ org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
# Database access
org.onap.dmaap.datarouter.db.driver = org.mariadb.jdbc.Driver
-org.onap.dmaap.datarouter.db.url = jdbc:mariadb://172.100.0.2:3306/datarouter
+org.onap.dmaap.datarouter.db.url = jdbc:mariadb://datarouter-mariadb:3306/datarouter
org.onap.dmaap.datarouter.db.login = datarouter
org.onap.dmaap.datarouter.db.password = datarouter