clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1810 from dotcloud/1798-inspect-fix

Browse Source 
Detect images/containers conflicts in docker inspect
This commit is contained in:
Michael Crosby
2013-09-05 17:17:09 -07:00
parent d06a0ba1a7 20a763e519
commit f3d51bb3d5
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api.go
+10
View File
@@ -819,6 +819,11 @@ func getContainersByName(srv *Server, version float64, w http.ResponseWriter, r
if err != nil {
return err
}
_, err = srv.ImageInspect(name)
if err == nil {
return fmt.Errorf("Conflict between containers and images")
}
b, err := json.Marshal(container)
if err != nil {
return err
@@ -837,6 +842,11 @@ func getImagesByName(srv *Server, version float64, w http.ResponseWriter, r *htt
if err != nil {
return err
}
_, err = srv.ContainerInspect(name)
if err == nil {
return fmt.Errorf("Conflict between containers and images")
}
b, err := json.Marshal(image)
if err != nil {
return err