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

Closes #3285 

This modification permits the swarm-agent created by docker-machine to
take into account the —swarm-opt arguments.

Signed-off-by: Lucien Gougerot <lucien.gougerot@gmail.com>
This commit is contained in:
Lucien Gougerot 2016-04-08 16:56:07 +02:00
parent cbb87491e1
commit b0ef41f624
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{
Image: swarmOptions.Image,
Env: swarmOptions.Env,
Cmd: []string{
cmdWorker := []string{
"join",
"--advertise",
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,
}
if swarmOptions.IsExperimental {