X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Fmain%2Fresources%2Fdocker-compose%2Fdocker-compose.yml;fp=datarouter-prov%2Fsrc%2Fmain%2Fresources%2Fdocker-compose%2Fdocker-compose.yml;h=6aee4dbd7071c24bc6cfdc719cfe133aaae2e484;hb=e06737d701ff5b3dcab311f4337ce40be52c966e;hp=eece1554f874b9b2a95c08f94d622a4e4ca9f05f;hpb=49fbf9a09d244bbdc19783d9ff10cd03cd89640a;p=dmaap%2Fdatarouter.git

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 eece1554..6aee4dbd 100644
--- a/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
+++ b/datarouter-prov/src/main/resources/docker-compose/docker-compose.yml
@@ -30,11 +30,9 @@ services:
      - "8443:8443"
      - "8080:8080"  
     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/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
-    entrypoint: ["bash", "-c", "./startup.sh"]
     depends_on:
       mariadb_container:
         condition: service_healthy
@@ -58,7 +56,6 @@ services:
      - "9090:8080"
     volumes:
      - ./node_data/node.properties:/opt/app/datartr/etc/node.properties
-    entrypoint: ["bash", "-c", "./startup.sh"]
     depends_on:
       datarouter-prov:
         condition: service_healthy
@@ -73,15 +70,17 @@ services:
     container_name: mariadb
     ports:
       - "3306:3306"
+#    volumes:
+#     - ./database/sql_init_01.sql:/docker-entrypoint-initdb.d/sql_init_01.sql
     environment:
       MYSQL_ROOT_PASSWORD: datarouter
       MYSQL_DATABASE: datarouter
       MYSQL_USER: datarouter
       MYSQL_PASSWORD: datarouter
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
       interval: 10s
-      timeout: 10s
+      timeout: 30s
       retries: 5
 
     networks: