Update for OOM integration

[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 eece155..6aee4db 100644 (file)
--- 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"\r
      - "8080:8080"  \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/provserver.properties:/opt/app/datartr/etc/provserver.properties\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
       mariadb_container:\r
         condition: service_healthy\r
@@ -58,7 +56,6 @@ services:
      - "9090:8080"\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
         condition: service_healthy\r
@@ -73,15 +70,17 @@ services:
     container_name: mariadb\r
     ports:\r
       - "3306:3306"\r
+#    volumes:\r
+#     - ./database/sql_init_01.sql:/docker-entrypoint-initdb.d/sql_init_01.sql\r
     environment:\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
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]\r
       interval: 10s\r
-      timeout: 10s\r
+      timeout: 30s\r
       retries: 5\r
 \r
     networks:\r