Merge "bug 801 increase healthcheck timeout for NBI/POL/MON"

diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 2fb0800..71b6bbb 100644 (file)
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -82,7 +82,7 @@ ENV OSMMON_PROMETHEUS_URL http://prometheus:9090
 
 EXPOSE 8000
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD osm-mon-healthcheck || exit 1
 
 CMD /bin/bash scripts/start.sh

diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 87fa0ac..0771c74 100644 (file)
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -81,7 +81,7 @@ ENV OSMNBI_AUTHENTICATION_BACKEND               internal
 ENV OSMNBI_PROMETHEUS_HOST                      prometheus
 ENV OSMNBI_PROMETHEUS_PORT                      9090
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD curl -k https://localhost:9999/osm/ | grep Welcome || exit 1
 
 # Run app.py when the container launches

diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile
index 6de7c71..2dd1382 100644 (file)
--- a/docker/POL/Dockerfile
+++ b/docker/POL/Dockerfile
@@ -55,7 +55,7 @@ ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db
 
 ENV OSMPOL_GLOBAL_LOG_LEVEL INFO
 
-HEALTHCHECK --interval=5s --timeout=2s --retries=12 \
+HEALTHCHECK --start-period=120s --interval=10s --timeout=5s --retries=5 \
   CMD osm-pol-healthcheck || exit 1
 
 CMD /bin/bash scripts/start.sh