docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gofmt 

Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
This commit is contained in:
Danny Yates 2014-01-08 10:37:22 +00:00
parent 145501bee3
commit c4535c833d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server.go
View File

@ -1128,8 +1128,8 @@ func (srv *Server) ImagePull(localName string, tag string, out io.Writer, sf *ut
// Retrieve the all the images to be uploaded in the correct order // Retrieve the all the images to be uploaded in the correct order
func (srv *Server) getImageList(localRepo map[string]string) ([]string, map[string][]string, error) { func (srv *Server) getImageList(localRepo map[string]string) ([]string, map[string][]string, error) {
var ( var (
imageList []string imageList []string
imagesSeen map[string]bool = make(map[string]bool) imagesSeen map[string]bool = make(map[string]bool)
tagsByImage map[string][]string = make(map[string][]string) tagsByImage map[string][]string = make(map[string][]string)
) )
@ -1153,7 +1153,7 @@ func (srv *Server) getImageList(localRepo map[string]string) ([]string, map[stri
} }
// reverse the image list for this tag (so the "most"-parent image is first) // reverse the image list for this tag (so the "most"-parent image is first)
for i, j := 0, len(imageListForThisTag) - 1; i < j; i, j = i + 1, j - 1 { for i, j := 0, len(imageListForThisTag)-1; i < j; i, j = i+1, j-1 {
imageListForThisTag[i], imageListForThisTag[j] = imageListForThisTag[j], imageListForThisTag[i] imageListForThisTag[i], imageListForThisTag[j] = imageListForThisTag[j], imageListForThisTag[i]
} }
@ -1183,7 +1183,7 @@ func (srv *Server) pushRepository(r *registry.Registry, out io.Writer, localName
for imgId, tags := range tagsByImage { for imgId, tags := range tagsByImage {
for _, tag := range tags { for _, tag := range tags {
imageIndex = append(imageIndex, &registry.ImgData{ imageIndex = append(imageIndex, &registry.ImgData{
ID: imgId, ID: imgId,
Tag: tag, Tag: tag,
}) })
} }
@ -1643,24 +1643,24 @@ func (srv *Server) ImageDelete(name string, autoPrune bool) ([]APIRmi, error) {
} }
} }
return srv.deleteImage(img, repository, tag) return srv.deleteImage(img, repository, tag)
} }
func (srv *Server) canDeleteImage(imgID string) error { func (srv *Server) canDeleteImage(imgID string) error {
for _, container := range srv.runtime.List() { for _, container := range srv.runtime.List() {
parent, err := srv.runtime.repositories.LookupImage(container.Image) parent, err := srv.runtime.repositories.LookupImage(container.Image)
if err != nil { if err != nil {
return err return err
} }
if err := parent.WalkHistory(func(p *Image) error { if err := parent.WalkHistory(func(p *Image) error {
if imgID == p.ID { if imgID == p.ID {
return fmt.Errorf("Conflict, cannot delete %s because the container %s is using it", utils.TruncateID(imgID), utils.TruncateID(container.ID)) return fmt.Errorf("Conflict, cannot delete %s because the container %s is using it", utils.TruncateID(imgID), utils.TruncateID(container.ID))
}
return nil
}); err != nil {
return err
} }
return nil
}); err != nil {
return err
} }
}
return nil return nil
} }
@ -1676,7 +1676,7 @@ func (srv *Server) ImageGetCached(imgID string, config *Config) (*Image, error)
imageMap := make(map[string][]string) imageMap := make(map[string][]string)
for _, img := range images { for _, img := range images {
imageMap[img.Parent] = append(imageMap[img.Parent], img.ID) imageMap[img.Parent] = append(imageMap[img.Parent], img.ID)
} }
sort.Strings(imageMap[imgID]) sort.Strings(imageMap[imgID])
// Loop on the children of the given image and check the config // Loop on the children of the given image and check the config
for _, elem := range imageMap[imgID] { for _, elem := range imageMap[imgID] {