diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-29 04:13:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 04:13:38 -0400 |
| commit | 1ec1c85b5a44afb0e76c40e0e908c6e55ab9c3dd (patch) | |
| tree | 888c3edb6838cdba4b3c86168aee3e7b0f7bdbf5 /cmd/podman/common/create_opts.go | |
| parent | f9395ddc5ad8b32e4e9b24542f0869722f7c9743 (diff) | |
| parent | a9f6592af6646d3692e8a7260df98dd606aa4d9b (diff) | |
| download | podman-1ec1c85b5a44afb0e76c40e0e908c6e55ab9c3dd.tar.gz podman-1ec1c85b5a44afb0e76c40e0e908c6e55ab9c3dd.tar.bz2 podman-1ec1c85b5a44afb0e76c40e0e908c6e55ab9c3dd.zip | |
Merge pull request #11048 from cdoern/heatlhCheckCompat
Fixed Healthcheck formatting, string to []string
Diffstat (limited to 'cmd/podman/common/create_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 66778f519..42e0efe5d 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -517,7 +517,14 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c cliOpts.OOMKillDisable = *cc.HostConfig.OomKillDisable } if cc.Config.Healthcheck != nil { - cliOpts.HealthCmd = strings.Join(cc.Config.Healthcheck.Test, " ") + finCmd := "" + for _, str := range cc.Config.Healthcheck.Test { + finCmd = finCmd + str + " " + } + 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) cliOpts.HealthStartPeriod = cc.Config.Healthcheck.StartPeriod.String() |