From eab41cac6f77e32552838b16253ff23aad13c5a5 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 27 Apr 2020 11:31:35 +0200 Subject: podman: handle --no-healthcheck Signed-off-by: Giuseppe Scrivano --- cmd/podman/common/specgen.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index ead67ee92..850fb11ec 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -203,10 +203,17 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string s.User = c.User inputCommand := args[1:] if len(c.HealthCmd) > 0 { + if c.NoHealthCheck { + return errors.New("Cannot specify both --no-healthcheck and --health-cmd") + } s.HealthConfig, err = makeHealthCheckFromCli(c.HealthCmd, c.HealthInterval, c.HealthRetries, c.HealthTimeout, c.HealthStartPeriod) if err != nil { return err } + } else if c.NoHealthCheck { + s.HealthConfig = &manifest.Schema2HealthConfig{ + Test: []string{"NONE"}, + } } userNS := ns.UsernsMode(c.UserNS) -- cgit v1.2.3-54-g00ecf