fix: Podman flag for healthcheck start interval

compose.go

@@ -252,6 +252,47 @@ func healthCheckCommandToString(cmd []string) (string, error) {
 	panic("unreachable")
 }
 
+// Health check.
+// https://docs.docker.com/compose/compose-file/05-services/#healthcheck
+func parseHealthCheck(c *NixContainer, service types.ServiceConfig, runtime ContainerRuntime) error {
+	if healthCheck := service.HealthCheck; healthCheck != nil {
+		// Figure out if the Dockerfile health check is disabled.
+		disable := healthCheck.Disable || (len(healthCheck.Test) > 0 && healthCheck.Test[0] == "NONE")
+		if disable {
+			c.ExtraOptions = append(c.ExtraOptions, "--no-healthcheck")
+		} else {
+			if len(healthCheck.Test) > 0 {
+				cmd, err := healthCheckCommandToString(healthCheck.Test)
+				if err != nil {
+					return fmt.Errorf("failed to convert healthcheck command: %w", err)
+				}
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-cmd=%s", cmd))
+			}
+			if timeout := healthCheck.Timeout; timeout != nil {
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-timeout=%v", *timeout))
+			}
+			if interval := healthCheck.Interval; interval != nil {
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-interval=%v", *interval))
+			}
+			if retries := healthCheck.Retries; retries != nil {
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-retries=%d", *retries))
+			}
+			if startPeriod := healthCheck.StartPeriod; startPeriod != nil {
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-start-period=%v", *startPeriod))
+			}
+			if startInterval := healthCheck.StartInterval; startInterval != nil {
+				flagName := "health-start-interval"
+				if runtime == ContainerRuntimePodman {
+					// https://docs.podman.io/en/latest/markdown/podman-run.1.html#health-startup-interval-interval
+					flagName = "health-startup-interval"
+				}
+				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--%s=%v", flagName, *startInterval))
+			}
+		}
+	}
+	return nil
+}
+
 func (g *Generator) buildNixContainer(service types.ServiceConfig, networkMap map[string]*NixNetwork, volumeMap map[string]*NixVolume) (*NixContainer, error) {
 	name := g.serviceToContainerName[service.Name]
 
@@ -572,38 +613,8 @@ func (g *Generator) buildNixContainer(service types.ServiceConfig, networkMap ma
 		c.ExtraOptions = append(c.ExtraOptions, mapToRepeatedKeyValFlag("--log-opt", logging.Options)...)
 	}
 
-	// Health check.
-	// https://docs.docker.com/compose/compose-file/05-services/#healthcheck
-	if healthCheck := service.HealthCheck; healthCheck != nil {
-		// Figure out if the Dockerfile health check is disabled.
-		disable := healthCheck.Disable || (len(healthCheck.Test) > 0 && healthCheck.Test[0] == "NONE")
-		if disable {
-			c.ExtraOptions = append(c.ExtraOptions, "--no-healthcheck")
-		} else {
-			if len(healthCheck.Test) > 0 {
-				cmd, err := healthCheckCommandToString(healthCheck.Test)
-				if err != nil {
-					return nil, fmt.Errorf("failed to convert healthcheck command: %w", err)
-				}
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-cmd=%s", cmd))
-			}
-			if timeout := healthCheck.Timeout; timeout != nil {
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-timeout=%v", *timeout))
-			}
-			if interval := healthCheck.Interval; interval != nil {
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-interval=%v", *interval))
-			}
-			if retries := healthCheck.Retries; retries != nil {
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-retries=%d", *retries))
-			}
-			if startPeriod := healthCheck.StartPeriod; startPeriod != nil {
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-start-period=%v", *startPeriod))
-			}
-			// Not supported by Docker.
-			if startInterval := healthCheck.StartInterval; startInterval != nil && g.Runtime == ContainerRuntimePodman {
-				c.ExtraOptions = append(c.ExtraOptions, fmt.Sprintf("--health-start-interval=%v", *startInterval))
-			}
-		}
+	if err := parseHealthCheck(c, service, g.Runtime); err != nil {
+		return nil, err
 	}
 
 	// Deploy resources configuration.

testdata/TestBasic.docker.nix

@@ -148,6 +148,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestBasic.podman.nix

@@ -148,8 +148,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestBasicAutoFormat.docker.nix

@@ -138,6 +138,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestBasicAutoFormat.podman.nix

@@ -138,8 +138,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestNoWriteNixSetup.docker.nix

@@ -133,6 +133,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestNoWriteNixSetup.podman.nix

@@ -128,8 +128,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestOverrideSystemdStopTimeout.docker.nix

@@ -141,6 +141,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestOverrideSystemdStopTimeout.podman.nix

@@ -141,8 +141,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestProject.docker.nix

@@ -139,6 +139,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestProject.podman.nix

@@ -139,8 +139,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestRemoveVolumes.docker.nix

@@ -139,6 +139,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestRemoveVolumes.podman.nix

@@ -139,8 +139,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestSystemdMount.docker.nix

@@ -145,6 +145,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestSystemdMount.podman.nix

@@ -145,8 +145,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"

testdata/TestUpheldBy.docker.nix

@@ -142,6 +142,7 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
+      "--health-start-interval=5s"
       "--health-start-period=40s"
       "--health-timeout=10s"
       "--log-opt=compress=true"

testdata/TestUpheldBy.podman.nix

@@ -142,8 +142,8 @@
       "--health-cmd=[\"curl\", \"-f\", \"http://localhost\"]"
       "--health-interval=1m30s"
       "--health-retries=3"
-      "--health-start-interval=5s"
       "--health-start-period=40s"
+      "--health-startup-interval=5s"
       "--health-timeout=10s"
       "--log-opt=compress=true"
       "--log-opt=max-file=3"