Windows: OCI process struct convergence

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f14f7711e7
Component: cli

components/cli/command/container/run.go

@@ -135,7 +135,7 @@ func runRun(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *runOptions
 	// a far better user experience rather than relying on subsequent resizes
 	// to cause things to catch up.
 	if runtime.GOOS == "windows" {
-		hostConfig.ConsoleSize[0], hostConfig.ConsoleSize[1] = dockerCli.Out().GetTtySize()
+		hostConfig.ConsoleSize.Height, hostConfig.ConsoleSize.Width = dockerCli.Out().GetTtySize()
 	}
 
 	ctx, cancelFun := context.WithCancel(context.Background())

components/cli/command/container/tty.go

@@ -16,7 +16,7 @@ import (
 )
 
 // resizeTtyTo resizes tty to specific height and width
-func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id string, height, width int, isExec bool) {
+func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id string, height, width uint, isExec bool) {
 	if height == 0 && width == 0 {
 		return
 	}

components/cli/command/out.go

@@ -48,7 +48,7 @@ func (o *OutStream) RestoreTerminal() {
 }
 
 // GetTtySize returns the height and width in characters of the tty
-func (o *OutStream) GetTtySize() (int, int) {
+func (o *OutStream) GetTtySize() (uint, uint) {
 	if !o.isTerminal {
 		return 0, 0
 	}
@@ -59,7 +59,7 @@ func (o *OutStream) GetTtySize() (int, int) {
 			return 0, 0
 		}
 	}
-	return int(ws.Height), int(ws.Width)
+	return uint(ws.Height), uint(ws.Width)
 }
 
 // NewOutStream returns a new OutStream object from a Writer