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

Add correct Swarm port bindings 

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2016-01-28 15:51:41 -08:00
parent 8a4576b2eb
commit 265dd37594
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libmachine/provision/configure_swarm.go
View File

@ -6,6 +6,7 @@ import (
"strings" "strings"
"github.com/docker/machine/libmachine/auth" "github.com/docker/machine/libmachine/auth"
"github.com/docker/machine/libmachine/engine"
"github.com/docker/machine/libmachine/log" "github.com/docker/machine/libmachine/log"
"github.com/docker/machine/libmachine/mcndockerclient" "github.com/docker/machine/libmachine/mcndockerclient"
"github.com/docker/machine/libmachine/swarm" "github.com/docker/machine/libmachine/swarm"
@ -32,13 +33,12 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
parts := strings.Split(u.Host, ":") parts := strings.Split(u.Host, ":")
port := parts[1] port := parts[1]
dockerPort := "2376"
dockerDir := p.GetDockerOptionsDir() dockerDir := p.GetDockerOptionsDir()
dockerHost := &mcndockerclient.RemoteDocker{ dockerHost := &mcndockerclient.RemoteDocker{
HostURL: fmt.Sprintf("tcp://%s:%s", ip, dockerPort), HostURL: fmt.Sprintf("tcp://%s:%d", ip, engine.DefaultPort),
AuthOption: &authOptions, AuthOption: &authOptions,
} }
advertiseInfo := fmt.Sprintf("%s:%s", ip, dockerPort) advertiseInfo := fmt.Sprintf("%s:%d", ip, engine.DefaultPort)
if swarmOptions.Master { if swarmOptions.Master {
advertiseMasterInfo := fmt.Sprintf("%s:%s", ip, "3376") advertiseMasterInfo := fmt.Sprintf("%s:%s", ip, "3376")
@ -65,9 +65,16 @@ func configureSwarm(p Provisioner, swarmOptions swarm.Options, authOptions auth.
Name: "always", Name: "always",
MaximumRetryCount: 0, MaximumRetryCount: 0,
}, },
Binds: []string{hostBind}, Binds: []string{hostBind},
PortBindings: map[string][]dockerclient.PortBinding{"3376/tcp": {{"", port}}}, PortBindings: map[string][]dockerclient.PortBinding{
NetworkMode: "host", "3376/tcp": {
{
HostIp: "0.0.0.0",
HostPort: port,
},
},
},
NetworkMode: "host",
} }
swarmMasterConfig := &dockerclient.ContainerConfig{ swarmMasterConfig := &dockerclient.ContainerConfig{