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

Merge pull request #3829 from vieux/fix_api_regression 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
commands.go
View File

@ -878,7 +878,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {
} }
for _, out := range outs.Data { for _, out := range outs.Data {
outID := out.Get("ID") outID := out.Get("Id")
if !*quiet { if !*quiet {
if *noTrunc { if *noTrunc {
fmt.Fprintf(w, "%s\t", outID) fmt.Fprintf(w, "%s\t", outID)
@ -1170,7 +1170,7 @@ func (cli *DockerCli) CmdImages(args ...string) error {
} }
if filter != "" { if filter != "" {
if filter == image.Get("ID") || filter == utils.TruncateID(image.Get("ID")) { if filter == image.Get("Id") || filter == utils.TruncateID(image.Get("Id")) {
startImage = image startImage = image
} }
@ -1228,7 +1228,7 @@ func (cli *DockerCli) CmdImages(args ...string) error {
for _, repotag := range out.GetList("RepoTags") { for _, repotag := range out.GetList("RepoTags") {
repo, tag := utils.ParseRepositoryTag(repotag) repo, tag := utils.ParseRepositoryTag(repotag)
outID := out.Get("ID") outID := out.Get("Id")
if !*noTrunc { if !*noTrunc {
outID = utils.TruncateID(outID) outID = utils.TruncateID(outID)
} }
@ -1254,12 +1254,12 @@ func (cli *DockerCli) WalkTree(noTrunc bool, images *engine.Table, byParent map[
for index, image := range images.Data { for index, image := range images.Data {
if index+1 == length { if index+1 == length {
printNode(cli, noTrunc, image, prefix+"└─") printNode(cli, noTrunc, image, prefix+"└─")
if subimages, exists := byParent[image.Get("ID")]; exists { if subimages, exists := byParent[image.Get("Id")]; exists {
cli.WalkTree(noTrunc, subimages, byParent, prefix+" ", printNode) cli.WalkTree(noTrunc, subimages, byParent, prefix+" ", printNode)
} }
} else { } else {
printNode(cli, noTrunc, image, prefix+"\u251C─") printNode(cli, noTrunc, image, prefix+"\u251C─")
if subimages, exists := byParent[image.Get("ID")]; exists { if subimages, exists := byParent[image.Get("Id")]; exists {
cli.WalkTree(noTrunc, subimages, byParent, prefix+"\u2502 ", printNode) cli.WalkTree(noTrunc, subimages, byParent, prefix+"\u2502 ", printNode)
} }
} }
@ -1267,7 +1267,7 @@ func (cli *DockerCli) WalkTree(noTrunc bool, images *engine.Table, byParent map[
} else { } else {
for _, image := range images.Data { for _, image := range images.Data {
printNode(cli, noTrunc, image, prefix+"└─") printNode(cli, noTrunc, image, prefix+"└─")
if subimages, exists := byParent[image.Get("ID")]; exists { if subimages, exists := byParent[image.Get("Id")]; exists {
cli.WalkTree(noTrunc, subimages, byParent, prefix+" ", printNode) cli.WalkTree(noTrunc, subimages, byParent, prefix+" ", printNode)
} }
} }
@ -1280,10 +1280,10 @@ func (cli *DockerCli) printVizNode(noTrunc bool, image *engine.Env, prefix strin
parentID string parentID string
) )
if noTrunc { if noTrunc {
imageID = image.Get("ID") imageID = image.Get("Id")
parentID = image.Get("ParentId") parentID = image.Get("ParentId")
} else { } else {
imageID = utils.TruncateID(image.Get("ID")) imageID = utils.TruncateID(image.Get("Id"))
parentID = utils.TruncateID(image.Get("ParentId")) parentID = utils.TruncateID(image.Get("ParentId"))
} }
if parentID == "" { if parentID == "" {
@ -1300,9 +1300,9 @@ func (cli *DockerCli) printVizNode(noTrunc bool, image *engine.Env, prefix strin
func (cli *DockerCli) printTreeNode(noTrunc bool, image *engine.Env, prefix string) { func (cli *DockerCli) printTreeNode(noTrunc bool, image *engine.Env, prefix string) {
var imageID string var imageID string
if noTrunc { if noTrunc {
imageID = image.Get("ID") imageID = image.Get("Id")
} else { } else {
imageID = utils.TruncateID(image.Get("ID")) imageID = utils.TruncateID(image.Get("Id"))
} }
fmt.Fprintf(cli.out, "%s%s Virtual Size: %s", prefix, imageID, utils.HumanSize(image.GetInt64("VirtualSize"))) fmt.Fprintf(cli.out, "%s%s Virtual Size: %s", prefix, imageID, utils.HumanSize(image.GetInt64("VirtualSize")))
@ -1381,7 +1381,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {
for _, out := range outs.Data { for _, out := range outs.Data {
var ( var (
outID = out.Get("ID") outID = out.Get("Id")
outNames = out.GetList("Names") outNames = out.GetList("Names")
) )

8
integration/api_test.go
View File

@ -204,7 +204,7 @@ func TestGetImagesJSON(t *testing.T) {
} }
assertHttpNotError(r2, t) assertHttpNotError(r2, t)
images2 := engine.NewTable("ID", 0) images2 := engine.NewTable("Id", 0)
if _, err := images2.ReadListFrom(r2.Body.Bytes()); err != nil { if _, err := images2.ReadListFrom(r2.Body.Bytes()); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -215,7 +215,7 @@ func TestGetImagesJSON(t *testing.T) {
found = false found = false
for _, img := range images2.Data { for _, img := range images2.Data {
if img.Get("ID") == unitTestImageID { if img.Get("Id") == unitTestImageID {
found = true found = true
break break
} }
@ -237,7 +237,7 @@ func TestGetImagesJSON(t *testing.T) {
} }
assertHttpNotError(r3, t) assertHttpNotError(r3, t)
images3 := engine.NewTable("ID", 0) images3 := engine.NewTable("Id", 0)
if _, err := images3.ReadListFrom(r3.Body.Bytes()); err != nil { if _, err := images3.ReadListFrom(r3.Body.Bytes()); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -339,7 +339,7 @@ func TestGetContainersJSON(t *testing.T) {
if len(containers.Data) != beginLen+1 { if len(containers.Data) != beginLen+1 {
t.Fatalf("Expected %d container, %d found (started with: %d)", beginLen+1, len(containers.Data), beginLen) t.Fatalf("Expected %d container, %d found (started with: %d)", beginLen+1, len(containers.Data), beginLen)
} }
if id := containers.Data[0].Get("ID"); id != containerID { if id := containers.Data[0].Get("Id"); id != containerID {
t.Fatalf("Container ID mismatch. Expected: %s, received: %s\n", containerID, id) t.Fatalf("Container ID mismatch. Expected: %s, received: %s\n", containerID, id)
} }
} }

4
integration/runtime_test.go
View File

@ -60,8 +60,8 @@ func cleanup(eng *engine.Engine, t *testing.T) error {
t.Fatal(err) t.Fatal(err)
} }
for _, image := range images.Data { for _, image := range images.Data {
if image.Get("ID") != unitTestImageID { if image.Get("Id") != unitTestImageID {
mkServerFromEngine(eng, t).DeleteImage(image.Get("ID"), false) mkServerFromEngine(eng, t).DeleteImage(image.Get("Id"), false)
} }
} }
return nil return nil

6
integration/server_test.go
View File

@ -288,7 +288,7 @@ func TestRestartKillWait(t *testing.T) {
} }
setTimeout(t, "Waiting on stopped container timedout", 5*time.Second, func() { setTimeout(t, "Waiting on stopped container timedout", 5*time.Second, func() {
job = srv.Eng.Job("wait", outs.Data[0].Get("ID")) job = srv.Eng.Job("wait", outs.Data[0].Get("Id"))
var statusStr string var statusStr string
job.Stdout.AddString(&statusStr) job.Stdout.AddString(&statusStr)
if err := job.Run(); err != nil { if err := job.Run(); err != nil {
@ -472,7 +472,7 @@ func TestRmi(t *testing.T) {
} }
for _, image := range images.Data { for _, image := range images.Data {
if strings.Contains(unitTestImageID, image.Get("ID")) { if strings.Contains(unitTestImageID, image.Get("Id")) {
continue continue
} }
if image.GetList("RepoTags")[0] == "<none>:<none>" { if image.GetList("RepoTags")[0] == "<none>:<none>" {
@ -650,7 +650,7 @@ func assertContainerList(srv *docker.Server, all bool, limit int, since, before
return false return false
} }
for i := 0; i < len(outs.Data); i++ { for i := 0; i < len(outs.Data); i++ {
if outs.Data[i].Get("ID") != expected[i] { if outs.Data[i].Get("Id") != expected[i] {
return false return false
} }
} }

8
server.go
View File

@ -776,7 +776,7 @@ func (srv *Server) Images(job *engine.Job) engine.Status {
delete(allImages, id) delete(allImages, id)
out.Set("ParentId", image.Parent) out.Set("ParentId", image.Parent)
out.SetList("RepoTags", []string{fmt.Sprintf("%s:%s", name, tag)}) 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("Created", image.Created.Unix())
out.SetInt64("Size", image.Size) out.SetInt64("Size", image.Size)
out.SetInt64("VirtualSize", image.getParentsSize(0)+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 := &engine.Env{}
out.Set("ParentId", image.Parent) out.Set("ParentId", image.Parent)
out.SetList("RepoTags", []string{"<none>:<none>"}) out.SetList("RepoTags", []string{"<none>:<none>"})
out.Set("ID", image.ID) out.Set("Id", image.ID)
out.SetInt64("Created", image.Created.Unix()) out.SetInt64("Created", image.Created.Unix())
out.SetInt64("Size", image.Size) out.SetInt64("Size", image.Size)
out.SetInt64("VirtualSize", image.getParentsSize(0)+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) outs := engine.NewTable("Created", 0)
err = image.WalkHistory(func(img *Image) error { err = image.WalkHistory(func(img *Image) error {
out := &engine.Env{} out := &engine.Env{}
out.Set("ID", img.ID) out.Set("Id", img.ID)
out.SetInt64("Created", img.Created.Unix()) out.SetInt64("Created", img.Created.Unix())
out.Set("CreatedBy", strings.Join(img.ContainerConfig.Cmd, " ")) out.Set("CreatedBy", strings.Join(img.ContainerConfig.Cmd, " "))
out.SetList("Tags", lookupMap[img.ID]) out.SetList("Tags", lookupMap[img.ID])
@ -1027,7 +1027,7 @@ func (srv *Server) Containers(job *engine.Job) engine.Status {
} }
displayed++ displayed++
out := &engine.Env{} out := &engine.Env{}
out.Set("ID", container.ID) out.Set("Id", container.ID)
out.SetList("Names", names[container.ID]) out.SetList("Names", names[container.ID])
out.Set("Image", srv.runtime.repositories.ImageName(container.Image)) out.Set("Image", srv.runtime.repositories.ImageName(container.Image))
out.Set("Command", fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " "))) out.Set("Command", fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")))