@@ -161,14 +161,12 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {

 	if err := eng.Register("top", daemon.ContainerTop); err != nil {

 		return err

 	}

+	if err := eng.Register("containers", daemon.Containers); err != nil {

+		return err

+	}

 	return nil

 }

-// List returns an array of all containers registered in the daemon.

-func (daemon *Daemon) List() []*Container {

-	return daemon.containers.List()

-}

-

 // Get looks for a container by the specified ID or name, and returns it.

 // If the container is not found, or if an error occurs, nil is returned.

 func (daemon *Daemon) Get(name string) *Container {

new file mode 100644

@@ -0,0 +1,121 @@

+package daemon

+

+import (

+	"errors"

+	"fmt"

+	"strings"

+

+	"github.com/docker/docker/pkg/graphdb"

+

+	"github.com/docker/docker/engine"

+)

+

+// List returns an array of all containers registered in the daemon.

+func (daemon *Daemon) List() []*Container {

+	return daemon.containers.List()

+}

+

+func (daemon *Daemon) Containers(job *engine.Job) engine.Status {

+	var (

+		foundBefore bool

+		displayed   int

+		all         = job.GetenvBool("all")

+		since       = job.Getenv("since")

+		before      = job.Getenv("before")

+		n           = job.GetenvInt("limit")

+		size        = job.GetenvBool("size")

+	)

+	outs := engine.NewTable("Created", 0)

+

+	names := map[string][]string{}

+	daemon.ContainerGraph().Walk("/", func(p string, e *graphdb.Entity) error {

+		names[e.ID()] = append(names[e.ID()], p)

+		return nil

+	}, -1)

+

+	var beforeCont, sinceCont *Container

+	if before != "" {

+		beforeCont = daemon.Get(before)

+		if beforeCont == nil {

+			return job.Error(fmt.Errorf("Could not find container with name or id %s", before))

+		}

+	}

+

+	if since != "" {

+		sinceCont = daemon.Get(since)

+		if sinceCont == nil {

+			return job.Error(fmt.Errorf("Could not find container with name or id %s", since))

+		}

+	}

+

+	errLast := errors.New("last container")

+	writeCont := func(container *Container) error {

+		container.Lock()

+		defer container.Unlock()

+		if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" {

+			return nil

+		}

+		if before != "" && !foundBefore {

+			if container.ID == beforeCont.ID {

+				foundBefore = true

+			}

+			return nil

+		}

+		if n > 0 && displayed == n {

+			return errLast

+		}

+		if since != "" {

+			if container.ID == sinceCont.ID {

+				return errLast

+			}

+		}

+		displayed++

+		out := &engine.Env{}

+		out.Set("Id", container.ID)

+		out.SetList("Names", names[container.ID])

+		out.Set("Image", daemon.Repositories().ImageName(container.Image))

+		if len(container.Args) > 0 {

+			args := []string{}

+			for _, arg := range container.Args {

+				if strings.Contains(arg, " ") {

+					args = append(args, fmt.Sprintf("'%s'", arg))

+				} else {

+					args = append(args, arg)

+				}

+			}

+			argsAsString := strings.Join(args, " ")

+

+			out.Set("Command", fmt.Sprintf("\"%s %s\"", container.Path, argsAsString))

+		} else {

+			out.Set("Command", fmt.Sprintf("\"%s\"", container.Path))

+		}

+		out.SetInt64("Created", container.Created.Unix())

+		out.Set("Status", container.State.String())

+		str, err := container.NetworkSettings.PortMappingAPI().ToListString()

+		if err != nil {

+			return err

+		}

+		out.Set("Ports", str)

+		if size {

+			sizeRw, sizeRootFs := container.GetSize()

+			out.SetInt64("SizeRw", sizeRw)

+			out.SetInt64("SizeRootFs", sizeRootFs)

+		}

+		outs.Add(out)

+		return nil

+	}

+

+	for _, container := range daemon.List() {

+		if err := writeCont(container); err != nil {

+			if err != errLast {

+				return job.Error(err)

+			}

+			break

+		}

+	}

+	outs.ReverseSort()

+	if _, err := outs.WriteListTo(job.Stdout); err != nil {

+		return job.Error(err)

+	}

+	return engine.StatusOK

+}

deleted file mode 100644

@@ -1,120 +0,0 @@

-// DEPRECATION NOTICE. PLEASE DO NOT ADD ANYTHING TO THIS FILE.

-//

-// For additional commments see server/server.go

-//

-package server

-

-import (

-	"errors"

-	"fmt"

-	"strings"

-

-	"github.com/docker/docker/daemon"

-	"github.com/docker/docker/engine"

-	"github.com/docker/docker/pkg/graphdb"

-)

-

-func (srv *Server) Containers(job *engine.Job) engine.Status {

-	var (

-		foundBefore bool

-		displayed   int

-		all         = job.GetenvBool("all")

-		since       = job.Getenv("since")

-		before      = job.Getenv("before")

-		n           = job.GetenvInt("limit")

-		size        = job.GetenvBool("size")

-	)

-	outs := engine.NewTable("Created", 0)

-

-	names := map[string][]string{}

-	srv.daemon.ContainerGraph().Walk("/", func(p string, e *graphdb.Entity) error {

-		names[e.ID()] = append(names[e.ID()], p)

-		return nil

-	}, -1)

-

-	var beforeCont, sinceCont *daemon.Container

-	if before != "" {

-		beforeCont = srv.daemon.Get(before)

-		if beforeCont == nil {

-			return job.Error(fmt.Errorf("Could not find container with name or id %s", before))

-		}

-	}

-

-	if since != "" {

-		sinceCont = srv.daemon.Get(since)

-		if sinceCont == nil {

-			return job.Error(fmt.Errorf("Could not find container with name or id %s", since))

-		}

-	}

-

-	errLast := errors.New("last container")

-	writeCont := func(container *daemon.Container) error {

-		container.Lock()

-		defer container.Unlock()

-		if !container.State.IsRunning() && !all && n <= 0 && since == "" && before == "" {

-			return nil

-		}

-		if before != "" && !foundBefore {

-			if container.ID == beforeCont.ID {

-				foundBefore = true

-			}

-			return nil

-		}

-		if n > 0 && displayed == n {

-			return errLast

-		}

-		if since != "" {

-			if container.ID == sinceCont.ID {

-				return errLast

-			}

-		}

-		displayed++

-		out := &engine.Env{}

-		out.Set("Id", container.ID)

-		out.SetList("Names", names[container.ID])

-		out.Set("Image", srv.daemon.Repositories().ImageName(container.Image))

-		if len(container.Args) > 0 {

-			args := []string{}

-			for _, arg := range container.Args {

-				if strings.Contains(arg, " ") {

-					args = append(args, fmt.Sprintf("'%s'", arg))

-				} else {

-					args = append(args, arg)

-				}

-			}

-			argsAsString := strings.Join(args, " ")

-

-			out.Set("Command", fmt.Sprintf("\"%s %s\"", container.Path, argsAsString))

-		} else {

-			out.Set("Command", fmt.Sprintf("\"%s\"", container.Path))

-		}

-		out.SetInt64("Created", container.Created.Unix())

-		out.Set("Status", container.State.String())

-		str, err := container.NetworkSettings.PortMappingAPI().ToListString()

-		if err != nil {

-			return err

-		}

-		out.Set("Ports", str)

-		if size {

-			sizeRw, sizeRootFs := container.GetSize()

-			out.SetInt64("SizeRw", sizeRw)

-			out.SetInt64("SizeRootFs", sizeRootFs)

-		}

-		outs.Add(out)

-		return nil

-	}

-

-	for _, container := range srv.daemon.List() {

-		if err := writeCont(container); err != nil {

-			if err != errLast {

-				return job.Error(err)

-			}

-			break

-		}

-	}

-	outs.ReverseSort()

-	if _, err := outs.WriteListTo(job.Stdout); err != nil {

-		return job.Error(err)

-	}

-	return engine.StatusOK

-}

@@ -100,7 +100,6 @@ func InitServer(job *engine.Job) engine.Status {

 		"image_delete": srv.ImageDelete,

 		"events":       srv.Events,

 		"push":         srv.ImagePush,

-		"containers":   srv.Containers,

 	} {

 		if err := job.Eng.Register(name, srv.handlerWrap(handler)); err != nil {

 			return job.Error(err)