diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-27 16:26:36 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-03-31 08:50:32 -0400 |
| commit | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (patch) | |
| tree | b4c65b7cbbc1307e6a4c021531f4b7a1e53b4c8d /cmd/podman/utils.go | |
| parent | 9c7410d331ed6c9af50babb41314bfa67a3f39e0 (diff) | |
| download | podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.gz podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.tar.bz2 podman-3449b27cd1743a1353ea8c4503eec5d126d04b0d.zip | |
Switch to using --time as opposed to --timeout to better match Docker.
We need to consistently use --time rather then --timeout throughout the code.
Fix locations where timeout defaults are not set correctly as well.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/utils.go')
| -rw-r--r-- | cmd/podman/utils.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index 44e65b223..938a3f41e 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -63,6 +63,8 @@ func aliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName { name = "health-timeout" case "net": name = "network" + case "timeout": + name = "time" } return pflag.NormalizedName(name) } |