summaryrefslogtreecommitdiff
path: root/cmd/podman/shared/intermediate.go
diff options
context:
space:
mode:
authorHunor Csomortáni <csomh@redhat.com>2019-07-04 14:24:09 +0200
committerHunor Csomortáni <csomh@redhat.com>2019-07-16 06:15:28 +0200
commit3e53bfe36e385f6d85b10d1eadab0a249f580f97 (patch)
tree290cb9b711e1a4e72556f25adc277bc13f1555c7 /cmd/podman/shared/intermediate.go
parent51c00eae8b22356e72c84601e8c4f88b739755c7 (diff)
downloadpodman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.tar.gz
podman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.tar.bz2
podman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.zip
Make the healthcheck flags compatible with Docker CLI
Docker CLI calls the healthcheck flags "--health-*", instead of "--healthcheck-*". Introduce the former, in order to keep compatibility, and alias the later, in order to avoid breaking current usage. Change "--healthcheck-*" to "--health-*" in the docs and tests. Signed-off-by: Hunor Csomortáni <csomh@redhat.com>
Diffstat (limited to 'cmd/podman/shared/intermediate.go')
-rw-r--r--cmd/podman/shared/intermediate.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go
index 855f84086..8337dc647 100644
--- a/cmd/podman/shared/intermediate.go
+++ b/cmd/podman/shared/intermediate.go
@@ -399,11 +399,11 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes
m["gidmap"] = newCRStringSlice(c, "gidmap")
m["group-add"] = newCRStringSlice(c, "group-add")
m["help"] = newCRBool(c, "help")
- m["healthcheck-command"] = newCRString(c, "healthcheck-command")
- m["healthcheck-interval"] = newCRString(c, "healthcheck-interval")
- m["healthcheck-retries"] = newCRUint(c, "healthcheck-retries")
- m["healthcheck-start-period"] = newCRString(c, "healthcheck-start-period")
- m["healthcheck-timeout"] = newCRString(c, "healthcheck-timeout")
+ m["healthcheck-command"] = newCRString(c, "health-cmd")
+ m["healthcheck-interval"] = newCRString(c, "health-interval")
+ m["healthcheck-retries"] = newCRUint(c, "health-retries")
+ m["healthcheck-start-period"] = newCRString(c, "health-start-period")
+ m["healthcheck-timeout"] = newCRString(c, "health-timeout")
m["hostname"] = newCRString(c, "hostname")
m["http-proxy"] = newCRBool(c, "http-proxy")
m["image-volume"] = newCRString(c, "image-volume")