summaryrefslogtreecommitdiff
path: root/libpod/image
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-02-13 09:17:31 -0600
committerbaude <bbaude@redhat.com>2019-02-13 11:05:20 -0600
commitf29a11c201a67a82ca2b82d314a57043207aa1ac (patch)
tree037f60f26e99039defe3161a8595274c58cb5fe0 /libpod/image
parentee27c39f85507993c0a3dfe3c4dfab4c7b7e5e00 (diff)
downloadpodman-f29a11c201a67a82ca2b82d314a57043207aa1ac.tar.gz
podman-f29a11c201a67a82ca2b82d314a57043207aa1ac.tar.bz2
podman-f29a11c201a67a82ca2b82d314a57043207aa1ac.zip
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>
Diffstat (limited to 'libpod/image')
-rw-r--r--libpod/image/utils.go17
1 files changed, 12 insertions, 5 deletions
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