Merge branch 'master' into is6880/hash-api-key-secret

Author: giancarloromeo

scripts/docker/healthcheck_curl_host.py

@@ -6,7 +6,8 @@
     COPY --chown=scu:scu docker/healthcheck.py docker/healthcheck.py
     HEALTHCHECK --interval=30s \
                 --timeout=30s \
-                --start-period=1s \
+                --start-period=20s \
+                --start-interval=1s \
                 --retries=3 \
                 CMD python3 docker/healthcheck.py http://localhost:8080/v0/
 ```

services/agent/Dockerfile

@@ -148,10 +148,13 @@ COPY --chown=scu:scu services/agent/docker services/agent/docker
 RUN chmod +x services/agent/docker/*.sh
 
 
-HEALTHCHECK --interval=30s \
-  --timeout=20s \
-  --start-period=30s \
-  --retries=3 \
+# https://docs.docker.com/reference/dockerfile/#healthcheck
+HEALTHCHECK \
+  --interval=10s \
+  --timeout=5s \
+  --start-period=20s \
+  --start-interval=1s \
+  --retries=5 \
   CMD ["python3", "services/agent/docker/healthcheck.py", "http://localhost:8000/health"]
 
 EXPOSE 8000

services/agent/docker/healthcheck.py

@@ -6,7 +6,8 @@
     COPY --chown=scu:scu docker/healthcheck.py docker/healthcheck.py
     HEALTHCHECK --interval=30s \
                 --timeout=30s \
-                --start-period=1s \
+                --start-period=20s \
+                --start-interval=1s \
                 --retries=3 \
                 CMD python3 docker/healthcheck.py http://localhost:8000/
 ```
@@ -15,6 +16,7 @@
     1. why not to use curl instead of a python script?
         - SEE https://blog.sixeyed.com/docker-healthchecks-why-not-to-use-curl-or-iwr/
 """
+
 import os
 import sys
 from urllib.request import urlopen

services/api-server/Dockerfile

@@ -143,7 +143,8 @@ RUN chmod +x services/api-server/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/api-server/docker/healthcheck.py", "http://localhost:8000/"]
 

services/api-server/docker/healthcheck.py

@@ -6,9 +6,10 @@
     COPY --chown=scu:scu docker/healthcheck.py docker/healthcheck.py
     HEALTHCHECK --interval=30s \
                 --timeout=30s \
-                --start-period=1s \
+                --start-period=20s \
+                --start-interval=1s \
                 --retries=3 \
-                CMD python3 docker/healthcheck.py http://localhost:8000/
+                CMD python3 docker/healthcheck.py http://localhost:8080/v0/
 ```
 
 Q&A:

services/autoscaling/Dockerfile

@@ -156,9 +156,12 @@ COPY --chown=scu:scu services/autoscaling/docker services/autoscaling/docker
 RUN chmod +x services/autoscaling/docker/*.sh
 
 
-HEALTHCHECK --interval=10s \
+# https://docs.docker.com/reference/dockerfile/#healthcheck
+HEALTHCHECK \
+  --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/autoscaling/docker/healthcheck.py", "http://localhost:8000/"]
 

services/autoscaling/docker/healthcheck.py

@@ -6,9 +6,10 @@
     COPY --chown=scu:scu docker/healthcheck.py docker/healthcheck.py
     HEALTHCHECK --interval=30s \
                 --timeout=30s \
-                --start-period=1s \
+                --start-period=20s \
+                --start-interval=1s \
                 --retries=3 \
-                CMD python3 docker/healthcheck.py http://localhost:8000/
+                CMD python3 docker/healthcheck.py http://localhost:8080/v0/
 ```
 
 Q&A:

services/catalog/Dockerfile

@@ -140,9 +140,12 @@ COPY --chown=scu:scu --from=prod-only-deps  ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 COPY --chown=scu:scu services/catalog/docker services/catalog/docker
 RUN chmod +x services/catalog/docker/*.sh
 
-HEALTHCHECK --interval=10s \
+# https://docs.docker.com/reference/dockerfile/#healthcheck
+HEALTHCHECK \
+  --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/catalog/docker/healthcheck.py", "http://localhost:8000/"]
 

services/catalog/docker/healthcheck.py

@@ -6,9 +6,10 @@
     COPY --chown=scu:scu docker/healthcheck.py docker/healthcheck.py
     HEALTHCHECK --interval=30s \
                 --timeout=30s \
-                --start-period=1s \
+                --start-period=20s \
+                --start-interval=1s \
                 --retries=3 \
-                CMD python3 docker/healthcheck.py http://localhost:8000/
+                CMD python3 docker/healthcheck.py http://localhost:8080/v0/
 ```
 
 Q&A:

services/clusters-keeper/Dockerfile

@@ -159,9 +159,12 @@ COPY --chown=scu:scu services/clusters-keeper/docker services/clusters-keeper/do
 RUN chmod +x services/clusters-keeper/docker/*.sh
 
 
-HEALTHCHECK --interval=10s \
+# https://docs.docker.com/reference/dockerfile/#healthcheck
+HEALTHCHECK \
+  --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/clusters-keeper/docker/healthcheck.py", "http://localhost:8000/"]