Merge pull request #2879 from mheon/header_on_no_images

Print header for 'podman images' even with no images present
This commit is contained in:
OpenShift Merge Robot
2019-04-11 09:59:44 -07:00
committed by GitHub
4 changed files with 18 additions and 6 deletions

View File

@@ -318,13 +318,14 @@ func getImagesJSONOutput(ctx context.Context, images []*adapter.ContainerImage)
func generateImagesOutput(ctx context.Context, images []*adapter.ContainerImage, opts imagesOptions) error {
templateMap := GenImageOutputMap()
if len(images) == 0 {
return nil
}
var out formats.Writer
switch opts.format {
case formats.JSONString:
// If 0 images are present, print nothing for JSON
if len(images) == 0 {
return nil
}
imagesOutput := getImagesJSONOutput(ctx, images)
out = formats.JSONStructArray{Output: imagesToGeneric([]imagesTemplateParams{}, imagesOutput)}
default: