rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-31 22:32:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1239 from joshwget/docker-arguments-map

Browse Source 
Use a map to configure Docker arguments
This commit is contained in:
Darren Shepherd
2016-09-26 21:36:36 -07:00
committed by GitHub
parent 3bbf46b66d 065fe4a16e
commit e5293ff926
16 changed files with 1108 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
init/init.go
View File

@@ -165,7 +165,7 @@ func tryMountAndBootstrap(cfg *config.CloudConfig) (*config.CloudConfig, error)
func getLaunchConfig(cfg *config.CloudConfig, dockerCfg *config.DockerConfig) (*dockerlaunch.Config, []string) {
var launchConfig dockerlaunch.Config
args := dockerlaunch.ParseConfig(&launchConfig, append(dockerCfg.Args, dockerCfg.ExtraArgs...)...)
args := dockerlaunch.ParseConfig(&launchConfig, dockerCfg.FullArgs()...)
launchConfig.DnsConfig.Nameservers = cfg.Rancher.Defaults.Network.Dns.Nameservers
launchConfig.DnsConfig.Search = cfg.Rancher.Defaults.Network.Dns.Search