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

Merge pull request #17735 from LK4D4/errcode_resize 

Move errcode handling for resize upper
This commit is contained in:
David Calavera 2015-11-05 15:00:48 -08:00
parent 6417c53c5a bb0e7eb196
commit b232362310
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/container.go
View File

@ -244,9 +244,6 @@ func (container *Container) ExitOnNext() {
// Resize changes the TTY of the process running inside the container
// to the given height and width. The container must be running.
func (container *Container) Resize(h, w int) error {
if !container.IsRunning() {
return derr.ErrorCodeNotRunning.WithArgs(container.ID)
}
if err := container.command.ProcessConfig.Terminal.Resize(h, w); err != nil {
return err
}

6
daemon/resize.go
View File

@ -1,5 +1,7 @@
package daemon
import derr "github.com/docker/docker/errors"
// ContainerResize changes the size of the TTY of the process running
// in the container with the given name to the given height and width.
func (daemon *Daemon) ContainerResize(name string, height, width int) error {
@ -8,6 +10,10 @@ func (daemon *Daemon) ContainerResize(name string, height, width int) error {
return err
}
if !container.IsRunning() {
return derr.ErrorCodeNotRunning.WithArgs(container.ID)
}
if err = container.Resize(height, width); err == nil {
daemon.LogContainerEvent(container, "resize")
}