mirror of
https://github.com/containers/podman.git
synced 2025-08-06 03:19:52 +08:00
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
@ -9,6 +9,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/containers/common/libimage"
|
||||
"github.com/containers/podman/v3/libpod"
|
||||
"github.com/containers/podman/v3/libpod/define"
|
||||
"github.com/containers/podman/v3/pkg/domain/entities"
|
||||
@ -257,12 +258,13 @@ func ListStorageContainer(rt *libpod.Runtime, ctr storage.Container, opts entiti
|
||||
|
||||
imageName := ""
|
||||
if ctr.ImageID != "" {
|
||||
names, err := rt.ImageRuntime().ImageNames(ctr.ImageID)
|
||||
lookupOptions := &libimage.LookupImageOptions{IgnorePlatform: true}
|
||||
image, _, err := rt.LibimageRuntime().LookupImage(ctr.ImageID, lookupOptions)
|
||||
if err != nil {
|
||||
return ps, err
|
||||
}
|
||||
if len(names) > 0 {
|
||||
imageName = names[0]
|
||||
if len(image.NamesHistory()) > 0 {
|
||||
imageName = image.NamesHistory()[0]
|
||||
}
|
||||
} else if buildahCtr {
|
||||
imageName = "scratch"
|
||||
|
Reference in New Issue
Block a user