Merge pull request #1448 from darrenstahlmsft/ConsoleSize

Ensure ConsoleSize is not nil
This commit is contained in:
Phil Estes 2017-08-31 08:49:45 -04:00 committed by GitHub
commit c2e894c33a

View File

@ -53,6 +53,9 @@ func WithImageConfig(i Image) SpecOpts {
func WithTTY(width, height int) SpecOpts { func WithTTY(width, height int) SpecOpts {
return func(_ context.Context, _ *Client, _ *containers.Container, s *specs.Spec) error { return func(_ context.Context, _ *Client, _ *containers.Container, s *specs.Spec) error {
s.Process.Terminal = true s.Process.Terminal = true
if s.Process.ConsoleSize == nil {
s.Process.ConsoleSize = &specs.Box{}
}
s.Process.ConsoleSize.Width = uint(width) s.Process.ConsoleSize.Width = uint(width)
s.Process.ConsoleSize.Height = uint(height) s.Process.ConsoleSize.Height = uint(height)
return nil return nil