From f090475575c5e0eafa5b762ba9299990ed027d02 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 14 Aug 2013 16:59:21 +0000 Subject: [PATCH] add missing ParseRepositoryTag Upstream-commit: c84d74df8c17f50c8ca7f5027ade4db8360f5ed3 Component: engine --- components/engine/server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/server.go b/components/engine/server.go index 16b59dc83d..4660918e86 100644 --- a/components/engine/server.go +++ b/components/engine/server.go @@ -955,11 +955,11 @@ func (srv *Server) deleteImage(img *Image, repoName, tag string) ([]APIRmi, erro //If delete by id, see if the id belong only to one repository if strings.Contains(img.ID, repoName) && tag == "" { for _, repoAndTag := range srv.runtime.repositories.ByID()[img.ID] { - parsedRepo := strings.Split(repoAndTag, ":")[0] + parsedRepo, parsedTag := utils.ParseRepositoryTag(repoAndTag) if strings.Contains(img.ID, repoName) { repoName = parsedRepo - if len(srv.runtime.repositories.ByID()[img.ID]) == 1 && len(strings.Split(repoAndTag, ":")) > 1 { - tag = strings.Split(repoAndTag, ":")[1] + if len(srv.runtime.repositories.ByID()[img.ID]) == 1 && len(parsedTag) > 1 { + tag = parsedTag } } else if repoName != parsedRepo { // the id belongs to multiple repos, like base:latest and user:test,