diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-07-05 13:50:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 13:50:35 +0000 |
| commit | 340eeed0cb20855f1e6d2670704cfe67df3314f6 (patch) | |
| tree | 8fa91b359c7def9238c3835d55e7c00179896707 /pkg/specgen | |
| parent | 2c9f0753da6486b7ed2ef3b37b65ae0b9ca6d3fe (diff) | |
| parent | 5633ef1d15c17fa2e0249710c7591da777cd7b5e (diff) | |
| download | podman-340eeed0cb20855f1e6d2670704cfe67df3314f6.tar.gz podman-340eeed0cb20855f1e6d2670704cfe67df3314f6.tar.bz2 podman-340eeed0cb20855f1e6d2670704cfe67df3314f6.zip | |
Merge pull request #14626 from jakecorrenti/disable-docker-compose-health-check
Docker-compose disable healthcheck properly handled
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/kube/kube.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/specgen/generate/kube/kube.go b/pkg/specgen/generate/kube/kube.go index 39e15f950..c254b8192 100644 --- a/pkg/specgen/generate/kube/kube.go +++ b/pkg/specgen/generate/kube/kube.go @@ -511,12 +511,12 @@ func makeHealthCheck(inCmd string, interval int32, retries int32, timeout int32, cmd := []string{} if inCmd == "none" { - cmd = []string{"NONE"} + cmd = []string{define.HealthConfigTestNone} } else { err := json.Unmarshal([]byte(inCmd), &cmd) if err != nil { // ...otherwise pass it to "/bin/sh -c" inside the container - cmd = []string{"CMD-SHELL"} + cmd = []string{define.HealthConfigTestCmdShell} cmd = append(cmd, strings.Split(inCmd, " ")...) } } |