From 8c3d91936a60d57de3fc84021e40a7782acaa6eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hunor=20Csomort=C3=A1ni?= Date: Fri, 28 Jun 2019 13:06:08 +0200 Subject: [PATCH 1/4] Docs: --healthcheck is actually --healtcheck-command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hunor Csomortáni --- docs/podman-create.1.md | 2 +- docs/podman-run.1.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index b08488d7b0ef..b9f68c6b432b 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -266,7 +266,7 @@ The following example maps uids 0-2000 in the container to the uids 30000-31999 Add additional groups to run as -**--healthcheck**=*command* +**--healthcheck-command**=*command* 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 diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index 042a7a561794..f224234e09ab 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -273,7 +273,7 @@ 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* +**--healthcheck-command**=*command* 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 From 2eb79230aa75bb2969ad9da6271da94aed4933c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hunor=20Csomort=C3=A1ni?= Date: Fri, 28 Jun 2019 13:09:26 +0200 Subject: [PATCH 2/4] Docs: tell that healthchecks only work when running as root MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid users having to guess if the issue is with their setup or the way they run the commands. Signed-off-by: Hunor Csomortáni --- docs/podman-create.1.md | 2 ++ docs/podman-run.1.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index b9f68c6b432b..93ef8a2ab5cd 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -272,6 +272,8 @@ Set or alter a healthcheck command for a container. The command is a command to container that determines your container health. The command is required for other healthcheck options to be applied. A value of `none` disables existing healthchecks. +Healthchecks currently only work when running as root. + **--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 f224234e09ab..117328f2b967 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -279,6 +279,8 @@ Set or alter a healthcheck command for a container. The command is a command to container that determines your container health. The command is required for other healthcheck options to be applied. A value of `none` disables existing healthchecks. +Healthchecks currently only work when running as root. + **--healthcheck-interval**=*interval* Set an interval for the healthchecks (a value of `disable` results in no automatic timer setup) (default "30s") From 066aca270700af2d268e1c311edcb5e5d8d121b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hunor=20Csomort=C3=A1ni?= Date: Fri, 28 Jun 2019 13:11:20 +0200 Subject: [PATCH 3/4] Completion: --health-* is actually --healthcheck-* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although this is not compatible with [Docker CLI]. [Docker CLI]: https://docs.docker.com/engine/reference/run/#healthcheck Signed-off-by: Hunor Csomortáni --- completions/bash/podman | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/completions/bash/podman b/completions/bash/podman index 65c6308cc9d5..8bc945ed414f 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1807,10 +1807,11 @@ _podman_container_run() { if [ "$command" = "run" -o "$subcommand" = "run" ] ; then options_with_args="$options_with_args --detach-keys - --health-cmd - --health-interval - --health-retries - --health-timeout + --healthcheck-command + --healthcheck-interval + --healthcheck-retries + --healthcheck-start-period + --healthcheck-timeout " boolean_options="$boolean_options --detach -d From e404ff1b19ab0d5b9b9dd9001366501c17d60e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hunor=20Csomort=C3=A1ni?= Date: Fri, 28 Jun 2019 13:14:41 +0200 Subject: [PATCH 4/4] Completion: --no-healthcheck is not an option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Hunor Csomortáni --- completions/bash/podman | 1 - 1 file changed, 1 deletion(-) diff --git a/completions/bash/podman b/completions/bash/podman index 8bc945ed414f..2d0005853a05 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1815,7 +1815,6 @@ _podman_container_run() { " boolean_options="$boolean_options --detach -d - --no-healthcheck --rm --sig-proxy=false "