1 files changed, 52 insertions, 24 deletions
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 1c33e3b8..eece1554 100644
--- 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 @@
 # *
 #-------------------------------------------------------------------------------
 version: '2.1'
-services: 
+services:
   datarouter-prov:
-    image: onap/dmaap/datarouter-prov
+    image: nexus3.onap.org:10003/onap/dmaap/datarouter-prov
     container_name: datarouter-prov
     hostname: prov.datarouternew.com
     ports:
      - "8443:8443"
      - "8080:8080"  
-#    volumes:
-#     - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties
+    volumes:
+     - ./prov_data/proserver.properties:/opt/app/datartr/etc/proserver.properties
 #     - ./prov_data/datarouter-prov-jar-with-dependencies.jar:/opt/app/datartr/lib/datarouter-prov-jar-with-dependencies.jar
-#      - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-#      - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
-    entrypoint: ["bash", "-c", "sleep 10; /bin/sh -c ./startup.sh"]
+     - ./prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
+     - ./prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
+    entrypoint: ["bash", "-c", "./startup.sh"]
     depends_on:
-      mysql_container:
+      mariadb_container:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://prov.datarouternew.com:8080/internal/prov"]
+      interval: 10s
+      timeout: 10s
+      retries: 5
     extra_hosts:
-      - "node.datarouternew.com:172.18.0.4"
-    
+      - "node.datarouternew.com:172.100.0.4"
+    networks:
+      testing_net:
+        ipv4_address: 172.100.0.3
+
   datarouter-node:
-    image: onap/dmaap/datarouter-node
+    image: nexus3.onap.org:10003/onap/dmaap/datarouter-node
     container_name: datarouter-node
     hostname: node.datarouternew.com
     ports:
      - "9443:8443"
      - "9090:8080"
-#    volumes:
-#     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
-    entrypoint: ["bash", "-c", "sleep 15; /bin/sh -c ./startup.sh"]    
+    volumes:
+     - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
+    entrypoint: ["bash", "-c", "./startup.sh"]
     depends_on:
-      - datarouter-prov
+      datarouter-prov:
+        condition: service_healthy
     extra_hosts:
-      - "prov.datarouternew.com:172.18.0.3"
+      - "prov.datarouternew.com:172.100.0.3"
+    networks:
+      testing_net:
+        ipv4_address: 172.100.0.4
       
-  mysql_container:
-    image: mysql/mysql-server:5.6
-    container_name: mysql
+  mariadb_container:
+    image: mariadb:10.2.14
+    container_name: mariadb
     ports:
       - "3306:3306"
     environment:
-      MYSQL_ROOT_PASSWORD: att2017
-    volumes:
-      - ./database:/tmp/database
-      - ./database:/docker-entrypoint-initdb.d
-    
+      MYSQL_ROOT_PASSWORD: datarouter
+      MYSQL_DATABASE: datarouter
+      MYSQL_USER: datarouter
+      MYSQL_PASSWORD: datarouter
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      interval: 10s
+      timeout: 10s
+      retries: 5
+
+    networks:
+      testing_net:
+        ipv4_address: 172.100.0.2
+
+networks:
+  testing_net:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.100.0.0/16