diff options
| author | Matej Vasek <mvasek@redhat.com> | 2021-02-01 21:23:44 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-02-08 14:29:18 -0500 |
| commit | d6625f2948f182bfe01ec81d95f9865973f3ad3b (patch) | |
| tree | f12ab3bfc38917a916eed43a71722f7892a9fff6 /pkg/domain | |
| parent | 74db6e7ed3555deb13675b8f43465e200d8a8d85 (diff) | |
| download | podman-d6625f2948f182bfe01ec81d95f9865973f3ad3b.tar.gz podman-d6625f2948f182bfe01ec81d95f9865973f3ad3b.tar.bz2 podman-d6625f2948f182bfe01ec81d95f9865973f3ad3b.zip | |
Improve ContainerEngine.ContainerWait()
Signed-off-by: Matej Vasek <mvasek@redhat.com>
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/containers.go | 2 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/entities/containers.go b/pkg/domain/entities/containers.go index 63be5578f..2d50d6826 100644 --- a/pkg/domain/entities/containers.go +++ b/pkg/domain/entities/containers.go @@ -51,7 +51,7 @@ type ContainerRunlabelReport struct { } type WaitOptions struct { - Condition define.ContainerStatus + Condition []define.ContainerStatus Interval time.Duration Latest bool } diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index cfd3d7272..7a672d863 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(ctx, options.Interval, options.Condition) + exitCode, err := c.WaitForConditionWithInterval(ctx, options.Interval, options.Condition...) if err != nil { response.Error = err } else { |