diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-17 14:43:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 14:43:21 -0400 |
| commit | ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577 (patch) | |
| tree | 977792d0b732bb67f9270d34e30bfac3cb5aab73 /pkg/domain | |
| parent | a5884c07dfb092eab88cf153238e714910388a06 (diff) | |
| parent | 44a8cf867665927111fe9ea03711c8fabfc7d4a2 (diff) | |
| download | podman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.tar.gz podman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.tar.bz2 podman-ba289dcd79e3a2b5ec5dc02bd8adb84c93bef577.zip | |
Merge pull request #5868 from baude/v2t2
Fixes for system tests
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/images.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 10 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/images_list.go | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/pkg/domain/entities/images.go b/pkg/domain/entities/images.go index 78ebb8805..3a6d159e4 100644 --- a/pkg/domain/entities/images.go +++ b/pkg/domain/entities/images.go @@ -50,10 +50,10 @@ func (i *Image) Id() string { } type ImageSummary struct { - ID string `json:"Id"` + ID string ParentId string `json:",omitempty"` RepoTags []string `json:",omitempty"` - Created int64 `json:",omitempty"` + Created time.Time `json:",omitempty"` Size int64 `json:",omitempty"` SharedSize int `json:",omitempty"` VirtualSize int64 `json:",omitempty"` 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, |