diff options
author | cdoern <cbdoer23@g.holycross.edu> | 2021-07-26 09:05:05 -0400 |
---|---|---|
committer | cdoern <cdoern@redhat.com> | 2021-07-28 09:52:41 -0400 |
commit | a9f6592af6646d3692e8a7260df98dd606aa4d9b (patch) | |
tree | d4fe0c7816873543f5fccc089468321f3ac7fabc /cmd/podman/common/create_opts.go | |
parent | fd1f57b3a667f69bb2ae424ec7a7735ef8f1fda4 (diff) | |
download | podman-a9f6592af6646d3692e8a7260df98dd606aa4d9b.tar.gz podman-a9f6592af6646d3692e8a7260df98dd606aa4d9b.tar.bz2 podman-a9f6592af6646d3692e8a7260df98dd606aa4d9b.zip |
Fixed Healthcheck formatting, string to []string
Compat healthcheck tests are of the format []string but podman's were of
the format string. Converted podman's to []string at the specgen level since it has the same effect
and removed the incorrect parsing of compat healthchecks.
fixes #10617
Signed-off-by: cdoern <cdoern@redhat.com>
Diffstat (limited to 'cmd/podman/common/create_opts.go')
-rw-r--r-- | cmd/podman/common/create_opts.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index cca6399b7..42e0efe5d 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -521,7 +521,9 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c for _, str := range cc.Config.Healthcheck.Test { finCmd = finCmd + str + " " } - finCmd = finCmd[:len(finCmd)-1] + if len(finCmd) > 1 { + finCmd = finCmd[:len(finCmd)-1] + } cliOpts.HealthCmd = finCmd cliOpts.HealthInterval = cc.Config.Healthcheck.Interval.String() cliOpts.HealthRetries = uint(cc.Config.Healthcheck.Retries) |