diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-04-17 11:01:45 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-04-17 13:22:06 -0500 |
| commit | 44a8cf867665927111fe9ea03711c8fabfc7d4a2 (patch) | |
| tree | cac0714b1d0e4ae4636c03191f4752235dd1a38d /pkg/domain/infra | |
| parent | d68b028c9440cd3f952327b05f1bc8dee00ab98a (diff) | |
| download | podman-44a8cf867665927111fe9ea03711c8fabfc7d4a2.tar.gz podman-44a8cf867665927111fe9ea03711c8fabfc7d4a2.tar.bz2 podman-44a8cf867665927111fe9ea03711c8fabfc7d4a2.zip | |
Fixes for system tests
Various fixes to protect against regressions in system tests
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 10 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images_list.go | 2 |
2 files changed, 11 insertions, 1 deletions
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 } diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go index 2f4020374..68b961cb6 100644 --- a/pkg/domain/infra/abi/images_list.go +++ b/pkg/domain/infra/abi/images_list.go @@ -54,7 +54,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions) ID: img.ID(), ConfigDigest: string(img.ConfigDigest), - Created: img.Created().Unix(), + Created: img.Created(), Dangling: img.Dangling(), Digest: string(img.Digest()), Digests: digests, |