kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Move "resize" to daemon/resize.go

Browse source 
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-07-31 20:53:22 +00:00 • committed by Tibor Vass
parent c4ce396f46
commit e0fd96f850
4 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/daemon.go
View file

@ -138,6 +138,9 @@ func (daemon *Daemon) Install(eng *engine.Engine) error {
if err := eng.Register("wait", daemon.ContainerWait); err != nil { if err := eng.Register("wait", daemon.ContainerWait); err != nil {
return err return err
} }
if err := eng.Register("resize", daemon.ContainerResize); err != nil {
return err
}
return nil return nil
} }

29
daemon/resize.go Normal file
View file

@ -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)
}

22
server/container.go
View file

@ -386,28 +386,6 @@ func (srv *Server) ContainerDestroy(job *engine.Job) engine.Status {
return engine.StatusOK 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 { func (srv *Server) ContainerLogs(job *engine.Job) engine.Status {
if len(job.Args) != 1 { if len(job.Args) != 1 {
return job.Errorf("Usage: %s CONTAINER\n", job.Name) return job.Errorf("Usage: %s CONTAINER\n", job.Name)

1
server/init.go
View file

@ -87,7 +87,6 @@ func InitServer(job *engine.Job) engine.Status {
for name, handler := range map[string]engine.Handler{ for name, handler := range map[string]engine.Handler{
"tag": srv.ImageTag, // FIXME merge with "image_tag" "tag": srv.ImageTag, // FIXME merge with "image_tag"
"resize": srv.ContainerResize,
"commit": srv.ContainerCommit, "commit": srv.ContainerCommit,
"info": srv.DockerInfo, "info": srv.DockerInfo,
"container_delete": srv.ContainerDestroy, "container_delete": srv.ContainerDestroy,