Merge pull request #4310 from nalind/manifest-lists

Move to containers/image v5, support manifest lists

1 files changed, 11 insertions, 11 deletions

diff --git a/libpod/image/utils.go b/libpod/image/utils.go
index e4ff1cfc4..b7ea63c66 100644
--- a/libpod/image/utils.go
+++ b/libpod/image/utils.go
@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"strings"
 
-	cp "github.com/containers/image/v4/copy"
-	"github.com/containers/image/v4/docker/reference"
-	"github.com/containers/image/v4/signature"
-	"github.com/containers/image/v4/types"
+	cp "github.com/containers/image/v5/copy"
+	"github.com/containers/image/v5/docker/reference"
+	"github.com/containers/image/v5/signature"
+	"github.com/containers/image/v5/types"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
 )
@@ -87,18 +87,18 @@ 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, error) {
-	// map format is repo -> tag
+// as keys and the corresponding arrays of tags or digests-as-strings as values.
+func ReposToMap(names []string) (map[string][]string, error) {
+	// map format is repo -> []tag-or-digest
 	repos := make(map[string][]string)
-	for _, repo := range repotags {
+	for _, name := range names {
 		var repository, tag string
-		if len(repo) > 0 {
-			named, err := reference.ParseNormalizedNamed(repo)
-			repository = named.Name()
+		if len(name) > 0 {
+			named, err := reference.ParseNormalizedNamed(name)
 			if err != nil {
 				return nil, err
 			}
+			repository = named.Name()
 			if ref, ok := named.(reference.NamedTagged); ok {
 				tag = ref.Tag()
 			} else if ref, ok := named.(reference.Canonical); ok {