From 44a8cf867665927111fe9ea03711c8fabfc7d4a2 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Fri, 17 Apr 2020 11:01:45 -0500 Subject: Fixes for system tests Various fixes to protect against regressions in system tests Signed-off-by: Brent Baude --- pkg/domain/infra/abi/containers.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pkg/domain/infra/abi/containers.go') diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index c9df72f2d..50003dbe2 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -736,6 +736,16 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta } else { report.ExitCode = int(ecode) } + if opts.Rm { + if err := ic.Libpod.RemoveContainer(ctx, ctr, false, true); err != nil { + if errors.Cause(err) == define.ErrNoSuchCtr || + errors.Cause(err) == define.ErrCtrRemoved { + logrus.Warnf("Container %s does not exist: %v", ctr.ID(), err) + } else { + logrus.Errorf("Error removing container %s: %v", ctr.ID(), err) + } + } + } return &report, nil } -- cgit v1.2.3-54-g00ecf