uniformize

sanderegg · sanderegg · commit d0b8e77fd2f3 · 2025-04-22T11:25:50.000+02:00
diff --git a/scripts/docker/healthcheck_curl_host.py b/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/
 ```
diff --git a/services/agent/Dockerfile b/services/agent/Dockerfile
@@ -150,7 +150,8 @@ RUN chmod +x services/agent/docker/*.sh
 
 HEALTHCHECK --interval=30s \
   --timeout=20s \
-  --start-period=30s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=3 \
   CMD ["python3", "services/agent/docker/healthcheck.py", "http://localhost:8000/health"]
 
diff --git a/services/agent/docker/healthcheck.py b/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
diff --git a/services/api-server/Dockerfile b/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/"]
 
diff --git a/services/api-server/docker/healthcheck.py b/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:
diff --git a/services/autoscaling/Dockerfile b/services/autoscaling/Dockerfile
@@ -158,7 +158,8 @@ RUN chmod +x services/autoscaling/docker/*.sh
 
 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/"]
 
diff --git a/services/autoscaling/docker/healthcheck.py b/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:
diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile
@@ -142,7 +142,8 @@ RUN chmod +x services/catalog/docker/*.sh
 
 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/"]
 
diff --git a/services/catalog/docker/healthcheck.py b/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:
diff --git a/services/clusters-keeper/Dockerfile b/services/clusters-keeper/Dockerfile
@@ -161,7 +161,8 @@ RUN chmod +x services/clusters-keeper/docker/*.sh
 
 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/"]
 
diff --git a/services/clusters-keeper/docker/healthcheck.py b/services/clusters-keeper/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:
diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
@@ -151,10 +151,10 @@ RUN chmod +x services/dask-sidecar/docker/*.sh
 # In order to have the same healty entrypoint port
 # make sure dask worker is started as ``dask-worker --dashboard-address 8787``.
 # Otherwise the worker will take random ports to serve the /health entrypoint.
-HEALTHCHECK \
-  --interval=10s \
+HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["curl", "-Lf", "http://127.0.0.1:8787/health"]
 
diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile
@@ -143,7 +143,8 @@ RUN chmod +x services/datcore-adapter/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/datcore-adapter/docker/healthcheck.py", "http://localhost:8000/v0/live"]
 
diff --git a/services/datcore-adapter/docker/healthcheck.py b/services/datcore-adapter/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:
diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile
@@ -143,7 +143,8 @@ RUN chmod +x services/director-v2/docker/*.sh
 
 HEALTHCHECK --interval=30s \
   --timeout=20s \
-  --start-period=30s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=3 \
   CMD ["python3", "services/director-v2/docker/healthcheck.py", "http://localhost:8000/"]
 
diff --git a/services/director-v2/docker/healthcheck.py b/services/director-v2/docker/healthcheck.py
@@ -6,15 +6,17 @@
     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:
     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
diff --git a/services/director/Dockerfile b/services/director/Dockerfile
@@ -139,7 +139,7 @@ RUN chmod +x services/director/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=30s \
+  --start-period=20s \
   --start-interval=1s \
   --retries=5 \
   CMD ["python3", "/home/scu/services/director/docker/healthcheck.py", "http://localhost:8000/v0/"]
diff --git a/services/director/docker/healthcheck.py b/services/director/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:
diff --git a/services/docker-api-proxy/Dockerfile b/services/docker-api-proxy/Dockerfile
@@ -22,10 +22,9 @@ RUN apk add --no-cache \
   su-exec
 
 # Health check to ensure the proxy is running
-HEALTHCHECK \
-  --interval=10s \
+HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=30s \
+  --start-period=20s \
   --start-interval=1s \
   --retries=5 \
   CMD curl http://localhost:8888/version || exit 1
diff --git a/services/dynamic-scheduler/Dockerfile b/services/dynamic-scheduler/Dockerfile
@@ -143,7 +143,8 @@ RUN chmod +x services/dynamic-scheduler/docker/*.sh
 
 HEALTHCHECK --interval=30s \
   --timeout=20s \
-  --start-period=30s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=3 \
   CMD ["python3", "services/dynamic-scheduler/docker/healthcheck.py", "http://localhost:8000/health"]
 
diff --git a/services/dynamic-scheduler/docker/healthcheck.py b/services/dynamic-scheduler/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:
diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile
@@ -196,8 +196,7 @@ COPY --chown=scu:scu --from=prod-only-deps  ${DYNAMIC_SIDECAR_DY_VOLUMES_MOUNT_D
 COPY --chown=scu:scu services/dynamic-sidecar/docker services/dynamic-sidecar/docker
 RUN chmod +x services/dynamic-sidecar/docker/*.sh
 
-HEALTHCHECK \
-  --interval=10s \
+HEALTHCHECK --interval=10s \
   --timeout=5s \
   --start-period=180s \
   --start-interval=1s \
diff --git a/services/efs-guardian/Dockerfile b/services/efs-guardian/Dockerfile
@@ -177,7 +177,7 @@ RUN chmod +x services/efs-guardian/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=30s \
+  --start-period=20s \
   --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/efs-guardian/docker/healthcheck.py", "http://localhost:8000/"]
diff --git a/services/efs-guardian/docker/healthcheck.py b/services/efs-guardian/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:
diff --git a/services/invitations/Dockerfile b/services/invitations/Dockerfile
@@ -143,7 +143,8 @@ RUN chmod +x services/invitations/docker/*.sh
 
 HEALTHCHECK --interval=30s \
   --timeout=20s \
-  --start-period=30s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=3 \
   CMD ["python3", "services/invitations/docker/healthcheck.py", "http://localhost:8000/"]
 
diff --git a/services/invitations/docker/healthcheck.py b/services/invitations/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:
diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile
@@ -95,10 +95,10 @@ RUN chown -R scu /home/scu
 COPY --chown=scu:scu --from=build ${VIRTUAL_ENV} ${VIRTUAL_ENV}
 COPY --chown=scu:scu services/migration/docker services/migration/docker
 
-HEALTHCHECK \
-  --interval=5s \
+HEALTHCHECK --interval=5s \
   --timeout=10s \
-  --start-period=1ms \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=50 \
   CMD [ "/bin/sh", "/home/scu/services/migration/docker/healthcheck.sh"]
 
diff --git a/services/payments/Dockerfile b/services/payments/Dockerfile
@@ -143,7 +143,8 @@ RUN chmod +x services/payments/docker/*.sh
 
 HEALTHCHECK --interval=30s \
   --timeout=20s \
-  --start-period=30s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=3 \
   CMD ["python3", "services/payments/docker/healthcheck.py", "http://localhost:8000/"]
 
diff --git a/services/payments/docker/healthcheck.py b/services/payments/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:
diff --git a/services/resource-usage-tracker/Dockerfile b/services/resource-usage-tracker/Dockerfile
@@ -142,7 +142,8 @@ RUN chmod +x services/resource-usage-tracker/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "services/resource-usage-tracker/docker/healthcheck.py", "http://localhost:8000/"]
 
diff --git a/services/resource-usage-tracker/docker/healthcheck.py b/services/resource-usage-tracker/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:
diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
@@ -154,7 +154,8 @@ RUN chmod +x services/storage/docker/*.sh
 
 HEALTHCHECK --interval=10s \
   --timeout=15s \
-  --start-period=5s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "/home/scu/services/storage/docker/healthcheck.py", "http://localhost:8080/v0/"]
 
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
@@ -165,7 +165,8 @@ RUN chmod +x services/web/server/docker/*.sh
 ENV SC_HEALTHCHECK_TIMEOUT=120s
 HEALTHCHECK --interval=10s \
   --timeout=5s \
-  --start-period=10s \
+  --start-period=20s \
+  --start-interval=1s \
   --retries=5 \
   CMD ["python3", "/home/scu/services/web/server/docker/healthcheck.py", "http://localhost:8080/v0/health"]
 
