diff --git a/daemon/daemon.go b/daemon/daemon.go index 5f497454ab..87837d8bcb 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -138,6 +138,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error { if err := eng.Register("wait", daemon.ContainerWait); err != nil { return err } + if err := eng.Register("resize", daemon.ContainerResize); err != nil { + return err + } return nil } diff --git a/daemon/resize.go b/daemon/resize.go new file mode 100644 index 0000000000..dd196ff6c4 --- /dev/null +++ b/daemon/resize.go @@ -0,0 +1,29 @@ +package daemon + +import ( + "strconv" + + "github.com/docker/docker/engine" +) + +func (daemon *Daemon) ContainerResize(job *engine.Job) engine.Status { + if len(job.Args) != 3 { + return job.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name) + } + name := job.Args[0] + height, err := strconv.Atoi(job.Args[1]) + if err != nil { + return job.Error(err) + } + width, err := strconv.Atoi(job.Args[2]) + if err != nil { + return job.Error(err) + } + if container := daemon.Get(name); container != nil { + if err := container.Resize(height, width); err != nil { + return job.Error(err) + } + return engine.StatusOK + } + return job.Errorf("No such container: %s", name) +} diff --git a/server/container.go b/server/container.go index ac02ad7a5a..b71bfbfa15 100644 --- a/server/container.go +++ b/server/container.go @@ -386,28 +386,6 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status { return engine.StatusOK } -func (srv *Server) ContainerResize(job *engine.Job) engine.Status { - if len(job.Args) != 3 { - return job.Errorf("Not enough arguments. Usage: %s CONTAINER HEIGHT WIDTH\n", job.Name) - } - name := job.Args[0] - height, err := strconv.Atoi(job.Args[1]) - if err != nil { - return job.Error(err) - } - width, err := strconv.Atoi(job.Args[2]) - if err != nil { - return job.Error(err) - } - if container := srv.daemon.Get(name); container != nil { - if err := container.Resize(height, width); err != nil { - return job.Error(err) - } - return engine.StatusOK - } - return job.Errorf("No such container: %s", name) -} - func (srv *Server) ContainerLogs(job *engine.Job) engine.Status { if len(job.Args) != 1 { return job.Errorf("Usage: %s CONTAINER\n", job.Name) diff --git a/server/init.go b/server/init.go index 914f53d6b7..64d6563400 100644 --- a/server/init.go +++ b/server/init.go @@ -87,7 +87,6 @@ func InitServer(job *engine.Job) engine.Status { for name, handler := range map[string]engine.Handler{ "tag": srv.ImageTag, // FIXME merge with "image_tag" - "resize": srv.ContainerResize, "commit": srv.ContainerCommit, "info": srv.DockerInfo, "container_delete": srv.ContainerDestroy,