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 /test/compose | |
| 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 'test/compose')
| -rw-r--r-- | test/compose/disable_healthcheck/docker-compose.yml | 10 | ||||
| -rw-r--r-- | test/compose/disable_healthcheck/tests.sh | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/test/compose/disable_healthcheck/docker-compose.yml b/test/compose/disable_healthcheck/docker-compose.yml new file mode 100644 index 000000000..1f608c895 --- /dev/null +++ b/test/compose/disable_healthcheck/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3.7" +services: + noHc: + image: alpine + container_name: noHc + ports: + - "4000:80" + restart: unless-stopped + healthcheck: + disable: true diff --git a/test/compose/disable_healthcheck/tests.sh b/test/compose/disable_healthcheck/tests.sh new file mode 100644 index 000000000..2460a687e --- /dev/null +++ b/test/compose/disable_healthcheck/tests.sh @@ -0,0 +1,2 @@ +podman inspect --format='{{.Config.Healthcheck.Test}}' noHc +like $output "[NONE]" "$testname: healthcheck properly disabled" |