0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add missing ParseRepositoryTag

Browse source
This commit is contained in:
Victor Vieux 2013-08-14 16:59:21 +00:00
parent 4cb57a5438
commit c84d74df8c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server.go
View file

@ -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 delete by id, see if the id belong only to one repository
if strings.Contains(img.ID, repoName) && tag == "" { if strings.Contains(img.ID, repoName) && tag == "" {
for _, repoAndTag := range srv.runtime.repositories.ByID()[img.ID] { 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) { if strings.Contains(img.ID, repoName) {
repoName = parsedRepo repoName = parsedRepo
if len(srv.runtime.repositories.ByID()[img.ID]) == 1 && len(strings.Split(repoAndTag, ":")) > 1 { if len(srv.runtime.repositories.ByID()[img.ID]) == 1 && len(parsedTag) > 1 {
tag = strings.Split(repoAndTag, ":")[1] tag = parsedTag
} }
} else if repoName != parsedRepo { } else if repoName != parsedRepo {
// the id belongs to multiple repos, like base:latest and user:test, // the id belongs to multiple repos, like base:latest and user:test,