Merge pull request #16660 from Microsoft/js/hostname

Windows: --hostname support
Upstream-commit: 5ec323aaa298dfa3f60bb28a638df65e7ade8624
Component: engine

components/engine/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
 }

components/engine/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++ {