diff options
author | Miloslav Trmač <mitr@redhat.com> | 2019-01-09 22:18:25 +0100 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2019-01-14 04:07:24 +0100 |
commit | 797d194050d4b7b78d255d19f4099463dc048425 (patch) | |
tree | 4288d5f68c26140d9d22a10da798adf66058fd66 | |
parent | ad90c44f8d648ba17f07db7f05f28a67c16796d0 (diff) | |
download | podman-797d194050d4b7b78d255d19f4099463dc048425.tar.gz podman-797d194050d4b7b78d255d19f4099463dc048425.tar.bz2 podman-797d194050d4b7b78d255d19f4099463dc048425.zip |
Clarify comments about isRegistry a bit.
Should not change behavior.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
-rw-r--r-- | libpod/image/parts.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpod/image/parts.go b/libpod/image/parts.go index b5b05c32d..62cca2757 100644 --- a/libpod/image/parts.go +++ b/libpod/image/parts.go @@ -17,7 +17,8 @@ type imageParts struct { hasRegistry bool } -// Registries must contain a ":" or a "." or be localhost +// Registries must contain a ":" or a "." or be localhost; this helper exists for users of reference.Parse. +// For inputs that should use the docker.io[/library] normalization, use reference.ParseNormalizedNamed instead. func isRegistry(name string) bool { return strings.ContainsAny(name, ".:") || name == "localhost" } @@ -57,7 +58,9 @@ func decompose(input string) (imageParts, error) { } registry := reference.Domain(unnormalizedNamed) imageName := reference.Path(unnormalizedNamed) - // Is this a registry or a repo? + // ip.unnormalizedRef, because it uses reference.Parse and not reference.ParseNormalizedNamed, + // does not use the standard heuristics for domains vs. namespaces/repos, so we need to check + // explicitly. if isRegistry(registry) { hasRegistry = true } else { |