Parse fq name correctly for images

When parsing a string name for repo and tag (for images output), we
should be using parsenormalizedname and reference.Canonical to
get the proper output.

Resolves: #2175

Signed-off-by: baude <bbaude@redhat.com>

2 files changed, 17 insertions, 6 deletions

diff --git a/cmd/podman/images.go b/cmd/podman/images.go
index a9e8abbde..b269f6440 100644
--- a/cmd/podman/images.go
+++ b/cmd/podman/images.go
@@ -247,8 +247,12 @@ func getImagesTemplateOutput(ctx context.Context, images []*adapter.ContainerIma
 		}
 
 		// get all specified repo:tag pairs and print them separately
+		repopairs, err := image.ReposToMap(img.Names())
+		if err != nil {
+			logrus.Errorf("error finding tag/digest for %s", img.ID())
+		}
 	outer:
-		for repo, tags := range image.ReposToMap(img.Names()) {
+		for repo, tags := range repopairs {
 			for _, tag := range tags {
 				size, err := img.Size(ctx)
 				var sizeStr string
diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index ad027f32a..3585428ad 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -87,22 +87,29 @@ func hasTransport(image string) bool {
 
 // ReposToMap parses the specified repotags and returns a map with repositories
 // as keys and the corresponding arrays of tags as values.
-func ReposToMap(repotags []string) map[string][]string {
+func ReposToMap(repotags []string) (map[string][]string, error) {
 	// map format is repo -> tag
 	repos := make(map[string][]string)
 	for _, repo := range repotags {
 		var repository, tag string
 		if len(repo) > 0 {
-			li := strings.LastIndex(repo, ":")
-			repository = repo[0:li]
-			tag = repo[li+1:]
+			named, err := reference.ParseNormalizedNamed(repo)
+			repository = named.Name()
+			if err != nil {
+				return nil, err
+			}
+			if ref, ok := named.(reference.NamedTagged); ok {
+				tag = ref.Tag()
+			} else if ref, ok := named.(reference.Canonical); ok {
+				tag = ref.Digest().String()
+			}
 		}
 		repos[repository] = append(repos[repository], tag)
 	}
 	if len(repos) == 0 {
 		repos["<none>"] = []string{"<none>"}
 	}
-	return repos
+	return repos, nil
 }
 
 // GetAdditionalTags returns a list of reference.NamedTagged for the