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

Merge pull request #3829 from vieux/fix_api_regression

Browse Source 
Fix ID -> Id api
This commit is contained in:
Michael Crosby
2014-01-31 10:38:57 -08:00
parent 70ab72ff32 54072dbbd6
commit 643c7dc25d
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server.go
+4 -4
View File
@@ -776,7 +776,7 @@ func (srv *Server) Images(job *engine.Job) engine.Status {
delete(allImages, id)
out.Set("ParentId", image.Parent)
out.SetList("RepoTags", []string{fmt.Sprintf("%s:%s", name, tag)})
out.Set("ID", image.ID)
out.Set("Id", image.ID)
out.SetInt64("Created", image.Created.Unix())
out.SetInt64("Size", image.Size)
out.SetInt64("VirtualSize", image.getParentsSize(0)+image.Size)
@@ -797,7 +797,7 @@ func (srv *Server) Images(job *engine.Job) engine.Status {
out := &engine.Env{}
out.Set("ParentId", image.Parent)
out.SetList("RepoTags", []string{"<none>:<none>"})
out.Set("ID", image.ID)
out.Set("Id", image.ID)
out.SetInt64("Created", image.Created.Unix())
out.SetInt64("Size", image.Size)
out.SetInt64("VirtualSize", image.getParentsSize(0)+image.Size)
@@ -879,7 +879,7 @@ func (srv *Server) ImageHistory(job *engine.Job) engine.Status {
outs := engine.NewTable("Created", 0)
err = image.WalkHistory(func(img *Image) error {
out := &engine.Env{}
out.Set("ID", img.ID)
out.Set("Id", img.ID)
out.SetInt64("Created", img.Created.Unix())
out.Set("CreatedBy", strings.Join(img.ContainerConfig.Cmd, " "))
out.SetList("Tags", lookupMap[img.ID])
@@ -1027,7 +1027,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
}
displayed++
out := &engine.Env{}
out.Set("ID", container.ID)
out.Set("Id", container.ID)
out.SetList("Names", names[container.ID])
out.Set("Image", srv.runtime.repositories.ImageName(container.Image))
out.Set("Command", fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")))