healthcheck: set appropriate defaults for interval, timeout and retries

Set appropriate defaults from interval, timeout and retries when processing a Containerfile with build format as docker. See: https://docs.docker.com/engine/reference/builder/#healthcheck Closes: containers/podman#13912 Signed-off-by: Aditya R <[email protected]>
flouthoc · Apr 19, 2022 · fc0815e · fc0815e
1 parent d949291
commit fc0815e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/builder_test.go b/builder_test.go
@@ -630,6 +630,21 @@ func TestBuilder(t *testing.T) {
 				},
 			},
 		},
+		{
+			Dockerfile: "dockerclient/testdata/Dockerfile.healthcheckdefaults",
+			From:       "debian",
+			Config: docker.Config{
+				Image: "debian",
+				Cmd:   []string{"/bin/sh", "-c", "/app/main.sh"},
+				Healthcheck: &docker.HealthConfig{
+					StartPeriod: 0 * time.Second,
+					Interval:    30 * time.Second,
+					Timeout:     30 * time.Second,
+					Retries:     3,
+					Test:        []string{"CMD-SHELL", "/app/check.sh --quiet"},
+				},
+			},
+		},
 		{
 			Dockerfile: "dockerclient/testdata/Dockerfile.envsubst",
 			From:       "busybox",

diff --git a/dispatchers.go b/dispatchers.go
@@ -516,12 +516,12 @@ func healthcheck(b *Builder, args []string, attributes map[string]bool, flagArgs
 		}
 
 		healthcheck := docker.HealthConfig{}
-
+		// Use docker defaults for flags https://docs.docker.com/engine/reference/builder/#healthcheck
 		flags := flag.NewFlagSet("", flag.ContinueOnError)
 		flags.String("start-period", "", "")
-		flags.String("interval", "", "")
-		flags.String("timeout", "", "")
-		flRetries := flags.String("retries", "", "")
+		flags.String("interval", "30s", "")
+		flags.String("timeout", "30s", "")
+		flRetries := flags.String("retries", "3", "")
 
 		if err := flags.Parse(flagArgs); err != nil {
 			return err

diff --git a/dockerclient/testdata/Dockerfile.healthcheckdefaults b/dockerclient/testdata/Dockerfile.healthcheckdefaults
@@ -0,0 +1,6 @@
+FROM debian
+CMD /app/main.sh
+HEALTHCHECK   CMD   a b
+HEALTHCHECK CMD ["foo"]
+HEALTHCHECK CMD /app/check.sh --quiet
+