diff --git a/daemon/container_windows.go b/daemon/container_windows.go index ea62f72f61..f0d0c06ea1 100644 --- a/daemon/container_windows.go +++ b/daemon/container_windows.go @@ -140,6 +140,7 @@ func populateCommand(c *Container, env []string) error { FirstStart: !c.HasBeenStartedBefore, LayerFolder: layerFolder, LayerPaths: layerPaths, + Hostname: c.Config.Hostname, } return nil diff --git a/daemon/execdriver/driver.go b/daemon/execdriver/driver.go index 7d44ee5354..aedee9781a 100644 --- a/daemon/execdriver/driver.go +++ b/daemon/execdriver/driver.go @@ -219,4 +219,5 @@ type Command struct { FirstStart bool `json:"first_start"` LayerPaths []string `json:"layer_paths"` // Windows needs to know the layer paths and folder for a command LayerFolder string `json:"layer_folder"` + Hostname string `json:"hostname"` // Windows sets the hostname in the execdriver } diff --git a/daemon/execdriver/windows/run.go b/daemon/execdriver/windows/run.go index dd47b0afca..9e7930c550 100644 --- a/daemon/execdriver/windows/run.go +++ b/daemon/execdriver/windows/run.go @@ -71,6 +71,7 @@ type containerInit struct { LayerFolderPath string // Where the layer folders are located Layers []layer // List of storage layers ProcessorWeight int64 // CPU Shares 1..9 on Windows; or 0 is platform default. + HostName string // Hostname } // defaultOwner is a tag passed to HCS to allow it to differentiate between @@ -101,6 +102,7 @@ func (d *Driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, hooks execd IgnoreFlushesDuringBoot: c.FirstStart, LayerFolderPath: c.LayerFolder, ProcessorWeight: c.Resources.CPUShares, + HostName: c.Hostname, } for i := 0; i < len(c.LayerPaths); i++ {