diff options
| author | Matej Vasek <mvasek@redhat.com> | 2021-02-01 20:21:03 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-02-08 14:29:10 -0500 |
| commit | 74db6e7ed3555deb13675b8f43465e200d8a8d85 (patch) | |
| tree | 18f627547da57e00f4de7697b4c35bb26037331e /pkg | |
| parent | d451aed9fe8d6c2e2cd51da43dcd37e2383f5264 (diff) | |
| download | podman-74db6e7ed3555deb13675b8f43465e200d8a8d85.tar.gz podman-74db6e7ed3555deb13675b8f43465e200d8a8d85.tar.bz2 podman-74db6e7ed3555deb13675b8f43465e200d8a8d85.zip | |
Improve container libpod.Wait*() functions
Signed-off-by: Matej Vasek <mvasek@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index d0599a595..cfd3d7272 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -100,7 +100,7 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin responses := make([]entities.WaitReport, 0, len(ctrs)) for _, c := range ctrs { response := entities.WaitReport{Id: c.ID()} - exitCode, err := c.WaitForConditionWithInterval(options.Interval, options.Condition) + exitCode, err := c.WaitForConditionWithInterval(ctx, options.Interval, options.Condition) if err != nil { response.Error = err } else { @@ -728,7 +728,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri return reports, errors.Wrapf(err, "unable to start container %s", ctr.ID()) } - if ecode, err := ctr.Wait(); err != nil { + if ecode, err := ctr.Wait(ctx); err != nil { if errors.Cause(err) == define.ErrNoSuchCtr { // Check events event, err := ic.Libpod.GetLastContainerEvent(ctx, ctr.ID(), events.Exited) @@ -867,7 +867,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta return &report, err } - if ecode, err := ctr.Wait(); err != nil { + if ecode, err := ctr.Wait(ctx); err != nil { if errors.Cause(err) == define.ErrNoSuchCtr { // Check events event, err := ic.Libpod.GetLastContainerEvent(ctx, ctr.ID(), events.Exited) |