containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make rmi messages more compatible with docker 

in the case where we rmi an image that has only one reponame, we print
out an untagged reponame message.

$ sudo podman rmi busybox
Untagged: docker.io/library/busybox:latest
Deleted: db8ee88ad75f6bdc74663f4992a185e2722fa29573abcc1a19186cc5ec09dceb

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2019-08-05 09:57:43 -05:00
parent 4349f42d66
commit e27ee5c840
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/runtime_img.go
View File

@ -28,6 +28,7 @@ import (
// RemoveImage deletes an image from local storage // RemoveImage deletes an image from local storage
// Images being used by running containers can only be removed if force=true // Images being used by running containers can only be removed if force=true
func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool) (string, error) { func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool) (string, error) {
var returnMessage string
r.lock.Lock() r.lock.Lock()
defer r.lock.Unlock() defer r.lock.Unlock()
@ -93,7 +94,11 @@ func (r *Runtime) RemoveImage(ctx context.Context, img *image.Image, force bool)
err = errStorage err = errStorage
} }
} }
return img.ID(), err for _, name := range img.Names() {
returnMessage = returnMessage + fmt.Sprintf("Untagged: %s\n", name)
}
returnMessage = returnMessage + fmt.Sprintf("Deleted: %s", img.ID())
return returnMessage, err
} }
// Remove containers that are in storage rather than Podman. // Remove containers that are in storage rather than Podman.