mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #16660 from Microsoft/js/hostname
Windows: --hostname support
This commit is contained in:
commit
5ec323aaa2
3 changed files with 4 additions and 0 deletions
|
@ -140,6 +140,7 @@ func populateCommand(c *Container, env []string) error {
|
|||
FirstStart: !c.HasBeenStartedBefore,
|
||||
LayerFolder: layerFolder,
|
||||
LayerPaths: layerPaths,
|
||||
Hostname: c.Config.Hostname,
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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++ {
|
||||
|
|
Loading…
Reference in a new issue