summaryrefslogtreecommitdiff
path: root/pkg
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 /pkg
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 'pkg')
-rw-r--r--pkg/varlinkapi/containers.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go
index f517e9b6e..de9c23034 100644
--- a/pkg/varlinkapi/containers.go
+++ b/pkg/varlinkapi/containers.go
@@ -341,7 +341,7 @@ func (i *LibpodAPI) WaitContainer(call iopodman.VarlinkCall, name string) error
if err != nil {
return call.ReplyContainerNotFound(name)
}
- exitCode, err := ctr.Wait()
+ exitCode, err := ctr.Wait(libpod.WaitTimeout)
if err != nil {
return call.ReplyErrorOccurred(err.Error())
}