summaryrefslogtreecommitdiff
path: root/cmd/podman/run.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-14 16:52:13 -0400
committerGitHub <noreply@github.com>2018-09-14 16:52:13 -0400
commit040555534532de45c84b8bcf09a6e6e59144b43b (patch)
treed68b35ff6f014f30a7beb308e85e111faa25ed40 /cmd/podman/run.go
parent8541ed41e4dde12173e9f488f136f216d099274e (diff)
parent9ec82caa3147d7afaf9361748661c8868194d132 (diff)
downloadpodman-040555534532de45c84b8bcf09a6e6e59144b43b.tar.gz
podman-040555534532de45c84b8bcf09a6e6e59144b43b.tar.bz2
podman-040555534532de45c84b8bcf09a6e6e59144b43b.zip
Merge pull request #1434 from rhatdan/wait
Add --interval flag to podman wait
Diffstat (limited to 'cmd/podman/run.go')
-rw-r--r--cmd/podman/run.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/run.go b/cmd/podman/run.go
index 3445daef5..7bdae3038 100644
--- a/cmd/podman/run.go
+++ b/cmd/podman/run.go
@@ -223,7 +223,7 @@ func runCmd(c *cli.Context) error {
return err
}
- if ecode, err := ctr.Wait(); err != nil {
+ if ecode, err := ctr.Wait(libpod.WaitTimeout); err != nil {
if errors.Cause(err) == libpod.ErrNoSuchCtr {
// The container may have been removed
// Go looking for an exit file