diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-31 16:32:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 16:32:59 +0200 |
| commit | 4e3010d4e761fcb3d6de3b38cac1dc5b4371b129 (patch) | |
| tree | 5f5a6a305536a7fa0c67cb3e10cd91da5c997223 /pkg/adapter/containers.go | |
| parent | 7d4ab3fd8f48c7ded1a226f148e3677a1122c657 (diff) | |
| parent | 3449b27cd1743a1353ea8c4503eec5d126d04b0d (diff) | |
| download | podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.gz podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.tar.bz2 podman-4e3010d4e761fcb3d6de3b38cac1dc5b4371b129.zip | |
Merge pull request #5681 from rhatdan/timeout
Switch to using --time as opposed to --timeout to better match Docker.
Diffstat (limited to 'pkg/adapter/containers.go')
| -rw-r--r-- | pkg/adapter/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index a2f73307b..c395ffc7f 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -1213,8 +1213,8 @@ func (r *LocalRuntime) generateSystemdgenContainerInfo(c *cliconfig.GenerateSyst return nil, false, err } - timeout := int(ctr.StopTimeout()) - if c.StopTimeout >= 0 { + timeout := ctr.StopTimeout() + if c.Flags().Changed("timeout") || c.Flags().Changed("time") { timeout = c.StopTimeout } |