Merge pull request #11609 from sankalp-r/add-healthcheck-ps

added healthcheck to ps command

Author: openshift-merge-robot

cmd/podman/containers/ps.go

@@ -375,6 +375,10 @@ func (l psReporter) State() string {
 
 // Status is a synonym for State()
 func (l psReporter) Status() string {
+	hc := l.ListContainer.Status
+	if hc != "" {
+		return l.State() + " (" + hc + ")"
+	}
 	return l.State()
 }
 

pkg/ps/ps.go

@@ -241,6 +241,13 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
 			UTS:    uts,
 		}
 	}
+
+	if hc, err := ctr.HealthCheckStatus(); err == nil {
+		ps.Status = hc
+	} else {
+		logrus.Debug(err)
+	}
+
 	return ps, nil
 }
 

test/e2e/healthcheck_run_test.go

@@ -80,6 +80,11 @@ var _ = Describe("Podman healthcheck run", func() {
 			time.Sleep(1 * time.Second)
 		}
 		Expect(exitCode).To(Equal(0))
+
+		ps := podmanTest.Podman([]string{"ps"})
+		ps.WaitWithDefaultTimeout()
+		Expect(ps).Should(Exit(0))
+		Expect(ps.OutputToString()).To(ContainSubstring("(healthy)"))
 	})
 
 	It("podman healthcheck that should fail", func() {