Merge pull request #2620 from baude/multilogs

display logs for multiple containers at the same time

1 files changed, 18 insertions, 1 deletions

diff --git a/cmd/podman/search.go b/cmd/podman/search.go
index 5997e144a..a10b9d419 100644
--- a/cmd/podman/search.go
+++ b/cmd/podman/search.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"reflect"
 	"strings"
 
 	"github.com/containers/buildah/pkg/formats"
@@ -79,7 +80,10 @@ func searchCmd(c *cliconfig.SearchValues) error {
 		return err
 	}
 	format := genSearchFormat(c.Format)
-	out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: results[0].HeaderMap()}
+	if len(results) == 0 {
+		return nil
+	}
+	out := formats.StdoutTemplateArray{Output: searchToGeneric(results), Template: format, Fields: genSearchOutputMap()}
 	formats.Writer(out).Out()
 	return nil
 }
@@ -99,3 +103,16 @@ func searchToGeneric(params []image.SearchResult) (genericParams []interface{})
 	}
 	return genericParams
 }
+
+func genSearchOutputMap() map[string]string {
+	io := image.SearchResult{}
+	v := reflect.Indirect(reflect.ValueOf(io))
+	values := make(map[string]string)
+
+	for i := 0; i < v.NumField(); i++ {
+		key := v.Type().Field(i).Name
+		value := key
+		values[key] = strings.ToUpper(splitCamelCase(value))
+	}
+	return values
+}