Merge pull request moby#35533 from AliyunContainerService/supress-war…

…ning-healthcheck-none Suppress warning when NONE was set for healthcheck
flavio · Nov 30, 2017 · 29d6aef · 29d6aef
2 parents 88e36dc + e987c55
commit 29d6aef
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/daemon/health.go b/daemon/health.go
@@ -254,6 +254,8 @@ func getProbe(c *container.Container) probe {
 		return &cmdProbe{shell: false}
 	case "CMD-SHELL":
 		return &cmdProbe{shell: true}
+	case "NONE":
+		return nil
 	default:
 		logrus.Warnf("Unknown healthcheck type '%s' (expected 'CMD') in container %s", config.Test[0], c.ID)
 		return nil