From 9eebfd40ae2408daa880fdfe48480b346772174b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Jun 2020 10:48:09 -0400 Subject: Account for non-default port number in image name Previously, if an image was tagged with the format $REGISTRY:$PORT/$REPO:$TAG, then `podman images` would display $PORT/$REPO:$TAG under the "TAG" field. This commit correctly displays $REGISTRY:$PORT/$REPO under the "REPOSITORY" field while the "TAG" field only displays $TAG. Signed-off-by: Lokesh Mandvekar Fixes: gh#6665 (cherry picked from commit 71f6dd47ddce82545865739cb3382c0beb3f65a4) --- cmd/podman/images/list.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 83acb53d9..b7a8b8911 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -193,7 +193,7 @@ func sortImages(imageS []*entities.ImageSummary) []imageReporter { } func tokenRepoTag(tag string) (string, string) { - tokens := strings.SplitN(tag, ":", 2) + tokens := strings.Split(tag, ":") switch len(tokens) { case 0: return tag, "" @@ -201,6 +201,8 @@ func tokenRepoTag(tag string) (string, string) { return tokens[0], "" case 2: return tokens[0], tokens[1] + case 3: + return tokens[0] + ":" + tokens[1], tokens[2] default: return "", "" } -- cgit v1.2.3-54-g00ecf