kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #3128 from codeaholics/1530-improve-error-message

Browse source 
Improve error message when refusing to remove image due to multiple repo tags
This commit is contained in:
Michael Crosby 2013-12-17 20:49:25 -08:00
commit 70c7220a99
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/sources/commandline/cli.rst
View file

@ -952,7 +952,7 @@ image is removed.
test2 latest fd484f19954f 23 seconds ago 7 B (virtual 4.964 MB) test2 latest fd484f19954f 23 seconds ago 7 B (virtual 4.964 MB)
$ sudo docker rmi fd484f19954f $ sudo docker rmi fd484f19954f
Error: Conflict, fd484f19954f wasn't deleted Error: Conflict, cannot delete image fd484f19954f because it is tagged in multiple repositories
2013/12/11 05:47:16 Error: failed to remove one or more images 2013/12/11 05:47:16 Error: failed to remove one or more images
$ sudo docker rmi test1 $ sudo docker rmi test1

2
server.go
View file

@ -1586,7 +1586,7 @@ func (srv *Server) deleteImage(img *Image, repoName, tag string) ([]APIRmi, erro
} 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,
// in that case return conflict // in that case return conflict
return imgs, nil return nil, fmt.Errorf("Conflict, cannot delete image %s because it is tagged in multiple repositories", utils.TruncateID(img.ID))
} }
} }
} else { } else {