DB utils update for db initialization

[dmaap/datarouter.git] / datarouter-prov / src / main / resources / docker-compose / docker-compose.yml

diff --git a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
index 1c33e3b..eece155 100644 (file)
--- a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
+++ b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
@@ -21,49 +21,77 @@
 # *\r
 #-------------------------------------------------------------------------------\r
 version: '2.1'\r
-services: \r
+services:\r
   datarouter-prov:\r
-    image: onap/dmaap/datarouter-prov\r
+    image: nexus3.onap.org:10003/onap/dmaap/datarouter-prov\r
     container_name: datarouter-prov\r
     hostname: prov.datarouternew.com\r
     ports:\r
      - "8443:8443"\r
      - "8080:8080"  \r
-#    volumes:\r
-#     - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties\r
+    volumes:\r
+     - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties\r
 #     - ./prov_data/datarouter-prov-jar-with-dependencies.jar:/opt/app/datartr/lib/datarouter-prov-jar-with-dependencies.jar\r
-#      - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt\r
-#      - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt\r
-    entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"]\r
+     - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt\r
+     - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt\r
+    entrypoint: ["bash", "-c", "./startup.sh"]\r
     depends_on:\r
-      mysql_container:\r
+      mariadb_container:\r
         condition: service_healthy\r
+    healthcheck:\r
+      test: ["CMD", "curl", "-f", "http://prov.datarouternew.com:8080/internal/prov"]\r
+      interval: 10s\r
+      timeout: 10s\r
+      retries: 5\r
     extra_hosts:\r
-      - "node.datarouternew.com:172.18.0.4"\r
-    \r
+      - "node.datarouternew.com:172.100.0.4"\r
+    networks:\r
+      testing_net:\r
+        ipv4_address: 172.100.0.3\r
+\r
   datarouter-node:\r
-    image: onap/dmaap/datarouter-node\r
+    image: nexus3.onap.org:10003/onap/dmaap/datarouter-node\r
     container_name: datarouter-node\r
     hostname: node.datarouternew.com\r
     ports:\r
      - "9443:8443"\r
      - "9090:8080"\r
-#    volumes:\r
-#     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties\r
-    entrypoint: ["bash", "-c", "sleep 15; /bin/sh -c ./startup.sh"]    \r
+    volumes:\r
+     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties\r
+    entrypoint: ["bash", "-c", "./startup.sh"]\r
     depends_on:\r
-      - datarouter-prov\r
+      datarouter-prov:\r
+        condition: service_healthy\r
     extra_hosts:\r
-      - "prov.datarouternew.com:172.18.0.3"\r
+      - "prov.datarouternew.com:172.100.0.3"\r
+    networks:\r
+      testing_net:\r
+        ipv4_address: 172.100.0.4\r
       \r
-  mysql_container:\r
-    image: mysql/mysql-server:5.6\r
-    container_name: mysql\r
+  mariadb_container:\r
+    image: mariadb:10.2.14\r
+    container_name: mariadb\r
     ports:\r
       - "3306:3306"\r
     environment:\r
-      MYSQL_ROOT_PASSWORD: att2017\r
-    volumes:\r
-      - ./database:/tmp/database\r
-      - ./database:/docker-entrypoint-initdb.d\r
-    \r
+      MYSQL_ROOT_PASSWORD: datarouter\r
+      MYSQL_DATABASE: datarouter\r
+      MYSQL_USER: datarouter\r
+      MYSQL_PASSWORD: datarouter\r
+    healthcheck:\r
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]\r
+      interval: 10s\r
+      timeout: 10s\r
+      retries: 5\r
+\r
+    networks:\r
+      testing_net:\r
+        ipv4_address: 172.100.0.2\r
+\r
+networks:\r
+  testing_net:\r
+    driver: bridge\r
+    ipam:\r
+      driver: default\r
+      config:\r
+        - subnet: 172.100.0.0/16\r