diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-16 21:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-16 21:23:52 +0200 |
| commit | 400851ac31a57f43916c4a1b653a33737f1e7e3b (patch) | |
| tree | 718f6e8f2b6a8c517e201cb784d09a3c156ccb81 /cmd/podman/shared/intermediate.go | |
| parent | a449e9a2cf4b73163df75674059de04488cd2706 (diff) | |
| parent | 47c1fe6a5cacb50e7e0db31044a9924dabca7de9 (diff) | |
| download | podman-400851ac31a57f43916c4a1b653a33737f1e7e3b.tar.gz podman-400851ac31a57f43916c4a1b653a33737f1e7e3b.tar.bz2 podman-400851ac31a57f43916c4a1b653a33737f1e7e3b.zip | |
Merge pull request #3508 from csomh/healthcheck-flag-compat
Make the healthcheck flags compatible with Docker CLI
Diffstat (limited to 'cmd/podman/shared/intermediate.go')
| -rw-r--r-- | cmd/podman/shared/intermediate.go | 10 |
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") |