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

Merge pull request #599 from ehazlett/swarm-auto-labels 

add swarm label of provider by default
This commit is contained in:
Evan Hazlett 2015-02-24 17:28:02 -05:00
parent 4f5de31d3f 348be4d325
commit bf61a142b2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
host.go
View File

@ -323,16 +323,19 @@ func (h *Host) generateDockerConfig(dockerPort int, caCertPath string, serverKey
daemonOpts string daemonOpts string
daemonOptsCfg string daemonOptsCfg string
daemonCfg string daemonCfg string
swarmLabels = []string{}
) )
// TODO @ehazlett: template? swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName()))
defaultDaemonOpts := fmt.Sprintf(`--tlsverify \
--tlscacert=%s \ defaultDaemonOpts := fmt.Sprintf(`--tlsverify --tlscacert=%s --tlskey=%s --tlscert=%s %s`,
--tlskey=%s \ caCertPath,
--tlscert=%s`, caCertPath, serverKeyPath, serverCertPath) serverKeyPath,
serverCertPath,
strings.Join(swarmLabels, " "),
)
switch d.DriverName() { switch d.DriverName() {
case "virtualbox", "vmwarefusion", "vmwarevsphere", "hyper-v": case "virtualbox", "vmwarefusion", "vmwarevsphere", "hyper-v":
daemonOpts = fmt.Sprintf("-H tcp://0.0.0.0:%d", dockerPort) daemonOpts = fmt.Sprintf("-H tcp://0.0.0.0:%d", dockerPort)
daemonOptsCfg = path.Join(d.GetDockerConfigDir(), "profile") daemonOptsCfg = path.Join(d.GetDockerConfigDir(), "profile")