Address review feedback

Author: Mohammed-Thaha

cli/command/formatter/container.go

@@ -21,14 +21,14 @@ import (
 const (
 	defaultContainerTableFormat = "table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.RunningFor}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
 
-	namesHeader      = "NAMES"
-	commandHeader    = "COMMAND"
-	runningForHeader = "CREATED"
-	mountsHeader     = "MOUNTS"
-	localVolumes     = "LOCAL VOLUMES"
-	networksHeader   = "NETWORKS"
-	platformHeader   = "PLATFORM"
-	healthCheckHeader = "HEALTHCHECK"
+	namesHeader        = "NAMES"
+	commandHeader      = "COMMAND"
+	runningForHeader   = "CREATED"
+	mountsHeader       = "MOUNTS"
+	localVolumes       = "LOCAL VOLUMES"
+	networksHeader     = "NETWORKS"
+	platformHeader     = "PLATFORM"
+	healthStatusHeader = "HEALTH STATUS"
 )
 
 // Platform wraps a [ocispec.Platform] to implement the stringer interface.
@@ -122,7 +122,7 @@ func NewContainerContext() *ContainerContext {
 		"LocalVolumes": localVolumes,
 		"Networks":     networksHeader,
 		"Platform":     platformHeader,
-		"HealthCheck": healthCheckHeader,
+		"HealthStatus": healthStatusHeader,
 	}
 	return &containerCtx
 }
@@ -354,25 +354,32 @@ func (c *ContainerContext) Networks() string {
 	return strings.Join(networks, ",")
 }
 
-// HealthCheck returns the container's health status (for example, "healthy","unhealthy", or "starting").
+// HealthStatus returns the container's health status (for example, "healthy","unhealthy", or "starting").
 // If no healthcheck is configured, an empty
 // string is returned.
-func (c *ContainerContext) HealthCheck() string {
+func (c *ContainerContext) HealthStatus() string {
 	if c.c.Health != nil && c.c.Health.Status != "" {
 		return string(c.c.Health.Status)
 	}
 
-	// Fallback for daemons/API versions that include health only in Status text.
-	switch {
-	case strings.HasSuffix(c.c.Status, "(healthy)"):
-		return string(container.Healthy)
-	case strings.HasSuffix(c.c.Status, "(unhealthy)"):
-		return string(container.Unhealthy)
-	case strings.HasSuffix(c.c.Status, "(health: starting)"):
-		return string(container.Starting)
+	// Fallback for API versions before v1.52, which include health only in Status text;
+	// see https://github.com/moby/moby/pull/50281
+	// see https://github.com/moby/moby/blob/docker-v29.4.3/daemon/container/health.go#L18-L43
+	_, health, ok := strings.Cut(c.c.Status, "(")
+	if !ok || !strings.HasSuffix(health, ")") {
+		return ""
 	}
 
-	return ""
+	health = strings.TrimSuffix(health, ")")
+	health = strings.TrimPrefix(health, "health: ")
+
+	parsedHealth := container.HealthStatus(health)
+	switch parsedHealth {
+	case container.Healthy, container.Unhealthy, container.Starting:
+		return health
+	default:
+		return ""
+	}
 }
 
 // DisplayablePorts returns formatted string representing open ports of container

cli/command/formatter/container_test.go

@@ -494,7 +494,7 @@ func TestContainerContextWriteJSON(t *testing.T) {
 		{
 			"Command":      `""`,
 			"CreatedAt":    expectedCreated,
-			"HealthCheck":  "",
+			"HealthStatus":  "",
 			"ID":           "containerID1",
 			"Image":        "ubuntu",
 			"Labels":       "",
@@ -512,7 +512,7 @@ func TestContainerContextWriteJSON(t *testing.T) {
 		{
 			"Command":      `""`,
 			"CreatedAt":    expectedCreated,
-			"HealthCheck":  "",
+			"HealthStatus":  "",
 			"ID":           "containerID2",
 			"Image":        "ubuntu",
 			"Labels":       "",
@@ -530,7 +530,7 @@ func TestContainerContextWriteJSON(t *testing.T) {
 		{
 			"Command":      `""`,
 			"CreatedAt":    expectedCreated,
-			"HealthCheck":  "",
+			"HealthStatus":  "",
 			"ID":           "containerID3",
 			"Image":        "ubuntu",
 			"Labels":       "",
@@ -618,7 +618,7 @@ func TestContainerBackCompat(t *testing.T) {
 		{field: "Image", expected: "docker.io/library/ubuntu"},
 		{field: "Command", expected: `"/bin/sh"`},
 		{field: "CreatedAt", expected: time.Unix(createdAtTime.Unix(), 0).String()},
-		{field: "HealthCheck", expected: ""},
+		{field: "HealthStatus", expected: ""},
 		{field: "RunningFor", expected: "12 months ago"},
 		{field: "Ports", expected: "8080/tcp"},
 		{field: "Status", expected: "running"},

docs/reference/commandline/container_ls.md

@@ -405,7 +405,7 @@ Valid placeholders for the Go template are listed below:
 | `.Ports`      | Exposed ports.                                                                                  |
 | `.State`      | Container status (for example; "created", "running", "exited").                                 |
 | `.Status`     | Container status with details about duration and health-status.                                 |
-| `.HealthCheck`| Container health status ("starting", "healthy", "unhealthy", or "none"; empty when unavailable).|
+| `.HealthStatus` | Container health status ("starting", "healthy", "unhealthy"; empty when unavailable).           |
 | `.Size`       | Container disk size.                                                                            |
 | `.Names`      | Container names.                                                                                |
 | `.Labels`     | All labels assigned to the container.                                                           |