Merge pull request #17735 from LK4D4/errcode_resize

Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine

components/engine/daemon/container.go

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

components/engine/daemon/resize.go

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