From c246b9d24f27c9ef020a044eee95ffc440145146 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 8 Jan 2018 12:57:37 -0600 Subject: Shortname deletion continued With certain short name usages, rmi still was unable to delete certain images. This was also reflected in several commit tests that were temporarily disabled. Signed-off-by: baude Closes: #200 Approved by: rhatdan --- libpod/runtime_img.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libpod') diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index 66630beb2..671e08c19 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -347,6 +347,7 @@ func getTags(nameInput string) (reference.NamedTagged, bool, error) { func (k *Image) GetLocalImageName() (string, error) { _, err := k.runtime.GetImage(k.Name) if err == nil { + k.LocalName = k.Name return k.Name, nil } localImages, err := k.runtime.GetImages(&ImageFilterParams{}) @@ -359,6 +360,7 @@ func (k *Image) GetLocalImageName() (string, error) { } for _, image := range localImages { if strings.HasPrefix(image.ID, k.Name) { + k.ID = image.ID return image.ID, nil } for _, name := range image.Names { @@ -379,11 +381,13 @@ func (k *Image) GetLocalImageName() (string, error) { } if imageName == k.Name { + k.LocalName = name return name, nil } imageSplit := strings.Split(imageName, "/") baseName := imageSplit[len(imageSplit)-1] if baseName == k.Name { + k.LocalName = name return name, nil } } -- cgit v1.2.3-54-g00ecf