docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3287 from LBaali/3285 

Add support for --swarm-opt to agent nodes
This commit is contained in:
Nathan LeClaire 2016-04-25 12:24:00 -07:00
parent 4e898b1806 b0ef41f624
commit 6839107ecc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libmachine/provision/configure_swarm.go
View File

@ -119,15 +119,20 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
}, },
} }
swarmWorkerConfig := &dockerclient.ContainerConfig{ cmdWorker := []string{
Image: swarmOptions.Image,
Env: swarmOptions.Env,
Cmd: []string{
"join", "join",
"--advertise", "--advertise",
advertiseInfo, advertiseInfo,
swarmOptions.Discovery, }
}, for _, option := range swarmOptions.ArbitraryFlags {
cmdWorker = append(cmdWorker, "--"+option)
}
cmdWorker = append(cmdWorker, swarmOptions.Discovery)
swarmWorkerConfig := &dockerclient.ContainerConfig{
Image: swarmOptions.Image,
Env: swarmOptions.Env,
Cmd: cmdWorker,
HostConfig: workerHostConfig, HostConfig: workerHostConfig,
} }
if swarmOptions.IsExperimental { if swarmOptions.IsExperimental {