From 97b16aecf9275f4103c2737b79d0c5e81583aa58 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Fri, 5 Jan 2018 04:33:42 +0000 Subject: [PATCH] Fix issue of filter in `docker ps` where `health=starting` returns nothing This fix tries to address the issue raised in 35920 where the filter of `docker ps` with `health=starting` always returns nothing. The issue was that in container view, the human readable string (`HealthString()` => `Health.String()`) of health status was used. In case of starting it is `"health: starting"`. However, the filter still uses `starting` so no match returned. This fix fixes the issue by using `container.Health.Status()` instead so that it matches the string (`starting`) passed by filter. This fix fixes 35920. Signed-off-by: Yong Tang --- container/view.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/container/view.go b/container/view.go index 164827c550..913d9e7470 100644 --- a/container/view.go +++ b/container/view.go @@ -295,6 +295,10 @@ func (v *memdbView) GetAllNames() map[string][]string { // transform maps a (deep) copied Container object to what queries need. // A lock on the Container is not held because these are immutable deep copies. func (v *memdbView) transform(container *Container) *Snapshot { + health := types.NoHealthcheck + if container.Health != nil { + health = container.Health.Status() + } snapshot := &Snapshot{ Container: types.Container{ ID: container.ID, @@ -313,7 +317,7 @@ func (v *memdbView) transform(container *Container) *Snapshot { Managed: container.Managed, ExposedPorts: make(nat.PortSet), PortBindings: make(nat.PortSet), - Health: container.HealthString(), + Health: health, Running: container.Running, Paused: container.Paused, ExitCode: container.ExitCode(),