diff options
| author | Stefan Becker <chemobejk@gmail.com> | 2019-07-13 18:22:41 +0300 |
|---|---|---|
| committer | Stefan Becker <chemobejk@gmail.com> | 2019-07-14 10:33:01 +0300 |
| commit | e4cba7d36a49353febfefcb25d2d820bc89e9d1b (patch) | |
| tree | da0d158215568fba288cd1db6a059c57c82c5fc9 /docs | |
| parent | c59d08bc77855c0d0d946fa44850a0bf03b102c9 (diff) | |
| download | podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.tar.gz podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.tar.bz2 podman-e4cba7d36a49353febfefcb25d2d820bc89e9d1b.zip | |
create: improve parser for --healthcheck-command
Fix Docker CLI compatibility issue: the "--healthcheck-command" option
value should not be split but instead be passed as single string to
"CMD-SHELL", i.e. "/bin/sh -c <opt>".
On the other hand implement the same extension as is already available
for "--entrypoint", i.e. allow the option value to be a JSON array of
strings. This will make life easier for tools like podman-compose.
Updated "--healthcheck-command" option values in tests accordingly.
Continuation of #3455 & #3507
Signed-off-by: Stefan Becker <chemobejk@gmail.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-create.1.md | 5 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 87e18dbb9..ea01a346c 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -272,12 +272,15 @@ The following example maps uids 0-2000 in the container to the uids 30000-31999 Add additional groups to run as -**--healthcheck-command**=*command* +**--healthcheck-command**=*"command"* | *'["command", "arg1", ...]'* Set or alter a healthcheck command for a container. The command is a command to be executed inside your container that determines your container health. The command is required for other healthcheck options to be applied. A value of `none` disables existing healthchecks. +Multiple options can be passed in the form of a JSON array; otherwise, the command will be interpreted +as an argument to `/bin/sh -c`. + **--healthcheck-interval**=*interval* Set an interval for the healthchecks (a value of `disable` results in no automatic timer setup) (default "30s") diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 95499edd6..e3dca9300 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -279,12 +279,15 @@ The example maps gids 0-2000 in the container to the gids 30000-31999 on the hos Add additional groups to run as -**--healthcheck-command**=*command* +**--healthcheck-command**=*"command"* | *'["command", "arg1", ...]'* Set or alter a healthcheck command for a container. The command is a command to be executed inside your container that determines your container health. The command is required for other healthcheck options to be applied. A value of `none` disables existing healthchecks. +Multiple options can be passed in the form of a JSON array; otherwise, the command will be interpreted +as an argument to `/bin/sh -c`. + **--healthcheck-interval**=*interval* Set an interval for the healthchecks (a value of `disable` results in no automatic timer setup) (default "30s") |