opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

do not crash when displaying dangling images

Browse Source 
the previous method required a populated image template to create
the headers and always selected the first image in the slice. when
dealing with dangling images, they are not populated and therefore
would panic.

Resolves: #2246

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2019-02-08 17:09:00 -06:00
parent afd4d5f4a4
commit e071ac20f8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/podman/images.go
View File

@ -305,6 +305,7 @@ func getImagesJSONOutput(ctx context.Context, images []*adapter.ContainerImage)
// generateImagesOutput generates the images based on the format provided // generateImagesOutput generates the images based on the format provided
func generateImagesOutput(ctx context.Context, images []*adapter.ContainerImage, opts imagesOptions) error { func generateImagesOutput(ctx context.Context, images []*adapter.ContainerImage, opts imagesOptions) error {
templateMap := GenImageOutputMap()
if len(images) == 0 { if len(images) == 0 {
return nil return nil
} }
@ -316,15 +317,17 @@ func generateImagesOutput(ctx context.Context, images []*adapter.ContainerImage,
out = formats.JSONStructArray{Output: imagesToGeneric([]imagesTemplateParams{}, imagesOutput)} out = formats.JSONStructArray{Output: imagesToGeneric([]imagesTemplateParams{}, imagesOutput)}
default: default:
imagesOutput := getImagesTemplateOutput(ctx, images, opts) imagesOutput := getImagesTemplateOutput(ctx, images, opts)
out = formats.StdoutTemplateArray{Output: imagesToGeneric(imagesOutput, []imagesJSONParams{}), Template: opts.outputformat, Fields: imagesOutput[0].HeaderMap()} out = formats.StdoutTemplateArray{Output: imagesToGeneric(imagesOutput, []imagesJSONParams{}), Template: opts.outputformat, Fields: templateMap}
} }
return formats.Writer(out).Out() return formats.Writer(out).Out()
} }
// HeaderMap produces a generic map of "headers" based on a line // GenImageOutputMap generates the map used for outputting the images header
// of output // without requiring a populated image. This replaces the previous HeaderMap
func (i *imagesTemplateParams) HeaderMap() map[string]string { // call.
v := reflect.Indirect(reflect.ValueOf(i)) func GenImageOutputMap() map[string]string {
io := imagesTemplateParams{}
v := reflect.Indirect(reflect.ValueOf(io))
values := make(map[string]string) values := make(map[string]string)
for i := 0; i < v.NumField(); i++ { for i := 0; i < v.NumField(); i++ {