diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-09-14 16:52:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 16:52:13 -0400 |
| commit | 040555534532de45c84b8bcf09a6e6e59144b43b (patch) | |
| tree | d68b35ff6f014f30a7beb308e85e111faa25ed40 /cmd/podman/wait.go | |
| parent | 8541ed41e4dde12173e9f488f136f216d099274e (diff) | |
| parent | 9ec82caa3147d7afaf9361748661c8868194d132 (diff) | |
| download | podman-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/wait.go')
| -rw-r--r-- | cmd/podman/wait.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cmd/podman/wait.go b/cmd/podman/wait.go index e919ab3ca..48d3885e7 100644 --- a/cmd/podman/wait.go +++ b/cmd/podman/wait.go @@ -3,8 +3,10 @@ package main import ( "fmt" "os" + "time" "github.com/containers/libpod/cmd/podman/libpodruntime" + "github.com/containers/libpod/libpod" "github.com/pkg/errors" "github.com/urfave/cli" ) @@ -15,7 +17,14 @@ var ( Block until one or more containers stop and then print their exit codes ` - waitFlags = []cli.Flag{LatestFlag} + waitFlags = []cli.Flag{ + cli.UintFlag{ + Name: "interval, i", + Usage: "Milliseconds to wait before polling for completion", + Value: uint(libpod.WaitTimeout), + }, + LatestFlag, + } waitCommand = cli.Command{ Name: "wait", Usage: "Block on one or more containers", @@ -57,7 +66,10 @@ func waitCmd(c *cli.Context) error { if err != nil { return errors.Wrapf(err, "unable to find container %s", container) } - returnCode, err := ctr.Wait() + if c.Uint("interval") == 0 { + return errors.Errorf("interval must be greater then 0") + } + returnCode, err := ctr.Wait(time.Duration(c.Uint("interval"))) if err != nil { if lastError != nil { fmt.Fprintln(os.Stderr, lastError) |