mirror of https://github.com/docker/docs.git
Merge pull request #599 from ehazlett/swarm-auto-labels
add swarm label of provider by default
This commit is contained in:
commit
bf61a142b2
15
host.go
15
host.go
|
@ -323,16 +323,19 @@ func (h *Host) generateDockerConfig(dockerPort int, caCertPath string, serverKey
|
|||
daemonOpts string
|
||||
daemonOptsCfg string
|
||||
daemonCfg string
|
||||
swarmLabels = []string{}
|
||||
)
|
||||
|
||||
// TODO @ehazlett: template?
|
||||
defaultDaemonOpts := fmt.Sprintf(`--tlsverify \
|
||||
--tlscacert=%s \
|
||||
--tlskey=%s \
|
||||
--tlscert=%s`, caCertPath, serverKeyPath, serverCertPath)
|
||||
swarmLabels = append(swarmLabels, fmt.Sprintf("--label=provider=%s", h.Driver.DriverName()))
|
||||
|
||||
defaultDaemonOpts := fmt.Sprintf(`--tlsverify --tlscacert=%s --tlskey=%s --tlscert=%s %s`,
|
||||
caCertPath,
|
||||
serverKeyPath,
|
||||
serverCertPath,
|
||||
strings.Join(swarmLabels, " "),
|
||||
)
|
||||
|
||||
switch d.DriverName() {
|
||||
|
||||
case "virtualbox", "vmwarefusion", "vmwarevsphere", "hyper-v":
|
||||
daemonOpts = fmt.Sprintf("-H tcp://0.0.0.0:%d", dockerPort)
|
||||
daemonOptsCfg = path.Join(d.GetDockerConfigDir(), "profile")
|
||||
|
|
Loading…
Reference in New Issue