Merge pull request #23232 from thaJeztah/update-default-retries

Healthcheck: set default retries to 3

builder/dockerfile/parser/testfiles/health/Dockerfile

@@ -2,7 +2,7 @@ FROM debian
 ADD check.sh main.sh /app/
 CMD /app/main.sh
 HEALTHCHECK
-HEALTHCHECK --interval=5s --timeout=3s --retries=1 \
+HEALTHCHECK --interval=5s --timeout=3s --retries=3 \
   CMD /app/check.sh --quiet
 HEALTHCHECK CMD
 HEALTHCHECK   CMD   a b

builder/dockerfile/parser/testfiles/health/result

@@ -2,7 +2,7 @@
 (add "check.sh" "main.sh" "/app/")
 (cmd "/app/main.sh")
 (healthcheck)
-(healthcheck ["--interval=5s" "--timeout=3s" "--retries=1"] "CMD" "/app/check.sh --quiet")
+(healthcheck ["--interval=5s" "--timeout=3s" "--retries=3"] "CMD" "/app/check.sh --quiet")
 (healthcheck "CMD")
 (healthcheck "CMD" "a b")
 (healthcheck ["--timeout=3s"] "CMD" "foo")

daemon/health.go

@@ -28,6 +28,10 @@ const (
 	// than this, the check is considered to have failed.
 	defaultProbeTimeout = 30 * time.Second
 
+	// Default number of consecutive failures of the health check
+	// for the container to be considered unhealthy.
+	defaultProbeRetries = 3
+
 	// Shut down a container if it becomes Unhealthy.
 	defaultExitOnUnhealthy = true
 
@@ -111,7 +115,7 @@ func handleProbeResult(d *Daemon, c *container.Container, result *types.Healthch
 
 	retries := c.Config.Healthcheck.Retries
 	if retries <= 0 {
-		retries = 1 // Default if unset or set to an invalid value
+		retries = defaultProbeRetries
 	}
 
 	h := c.State.Health

docs/reference/builder.md

@@ -1496,7 +1496,7 @@ The options that can appear before `CMD` are:
 
 * `--interval=DURATION` (default: `30s`)
 * `--timeout=DURATION` (default: `30s`)
-* `--retries=N` (default: `1`)
+* `--retries=N` (default: `3`)
 
 The health check will first run **interval** seconds after the container is
 started, and then again **interval** seconds after each previous check completes.