diff options
author | Jake Correnti <jcorrenti13@gmail.com> | 2022-06-16 15:57:01 -0400 |
---|---|---|
committer | Jake Correnti <jcorrenti13@gmail.com> | 2022-07-05 08:02:22 -0400 |
commit | 5633ef1d15c17fa2e0249710c7591da777cd7b5e (patch) | |
tree | 35439157caae1692340b4fa1f2de8d6f876bcbc6 /pkg/specgen | |
parent | d1e1400747fd3266bfc14d62b4174cd601107003 (diff) | |
download | podman-5633ef1d15c17fa2e0249710c7591da777cd7b5e.tar.gz podman-5633ef1d15c17fa2e0249710c7591da777cd7b5e.tar.bz2 podman-5633ef1d15c17fa2e0249710c7591da777cd7b5e.zip |
Docker-compose disable healthcheck properly handled
Previously, if a container had healthchecks disabled in the
docker-compose.yml file and the user did a `podman inspect <container>`,
they would have an incorrect output:
```
"Healthcheck":{
"Test":[
"CMD-SHELL",
"NONE"
],
"Interval":30000000000,
"Timeout":30000000000,
"Retries":3
}
```
After a quick change, the correct output is now the result:
```
"Healthcheck":{
"Test":[
"NONE"
]
}
```
Additionally, I extracted the hard-coded strings that were used for
comparisons into constants in `libpod/define` to prevent a similar issue
from recurring.
Closes: #14493
Signed-off-by: Jake Correnti <jcorrenti13@gmail.com>
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 689c740f0..5b4fa532c 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, " ")...) } } |