From d6625f2948f182bfe01ec81d95f9865973f3ad3b Mon Sep 17 00:00:00 2001 From: Matej Vasek Date: Mon, 1 Feb 2021 21:23:44 +0100 Subject: Improve ContainerEngine.ContainerWait() Signed-off-by: Matej Vasek --- pkg/domain/entities/containers.go | 2 +- pkg/domain/infra/abi/containers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/domain') 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 { -- cgit v1.2.3-54-g00ecf