summaryrefslogtreecommitdiff
path: root/pkg/domain/infra
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-04-14 13:20:59 -0500
committerBrent Baude <bbaude@redhat.com>2020-04-14 19:47:49 -0500
commit60dde457f6dc5ec5062a946dbd0848a2b0b06a22 (patch)
treed2ff642f668c58860f6e3aa03f1356fb84b95a1d /pkg/domain/infra
parentf0b6cdede554316643187d40c67684daf5a2a2bb (diff)
downloadpodman-60dde457f6dc5ec5062a946dbd0848a2b0b06a22.tar.gz
podman-60dde457f6dc5ec5062a946dbd0848a2b0b06a22.tar.bz2
podman-60dde457f6dc5ec5062a946dbd0848a2b0b06a22.zip
More system test fixes on regressions
Fix more regressions between v1 and v2 Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/domain/infra')
-rw-r--r--pkg/domain/infra/abi/images.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index a69a136a6..9467c14d4 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -46,7 +46,9 @@ func (ir *ImageEngine) Delete(ctx context.Context, nameOrId []string, opts entit
if err != nil {
return &report, errors.Wrapf(err, "unable to query local images")
}
-
+ if len(targets) == 0 {
+ return &report, nil
+ }
if len(targets) > 0 && len(targets) == len(previousTargets) {
return &report, errors.New("unable to delete all images; re-run the rmi command again.")
}
@@ -143,7 +145,7 @@ func (ir *ImageEngine) History(ctx context.Context, nameOrId string, opts entiti
func ToDomainHistoryLayer(layer *libpodImage.History) entities.ImageHistoryLayer {
l := entities.ImageHistoryLayer{}
l.ID = layer.ID
- l.Created = layer.Created.Unix()
+ l.Created = *layer.Created
l.CreatedBy = layer.CreatedBy
copy(l.Tags, layer.Tags)
l.Size = layer.Size