Merge pull request #23000 from jstarks/use_image_version_for_console_check

Windows: Use image version, not OS version for TTY fixup
Upstream-commit: 089166ebe29c1801483965b0e30b41fda53b1ec2
Component: engine
This commit is contained in:
Alexander Morozov
2016-05-25 17:40:56 -07:00
5 changed files with 19 additions and 5 deletions
+2
View File
@@ -34,6 +34,8 @@ func (daemon *Daemon) createSpec(c *container.Container) (*libcontainerd.Spec, e
return nil, fmt.Errorf("Failed to graph.Get on ImageID %s - %s", c.ImageID, err)
}
s.Platform.OSVersion = img.OSVersion
// In base spec
s.Hostname = c.FullHostname()