docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-10-31 10:34:26 +03:00
Code Activity

Merge pull request #182 from vieux/default_port

Browse Source 
replace 4243 by the docker port
This commit is contained in:
Andrea Luzzardi
2014-12-17 14:58:21 -08:00
parent 92c045b143 722cc2fb08
commit efc56c18c2
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,3 +1,3 @@
FROM golang:onbuild
EXPOSE 4243
EXPOSE 2375
ENTRYPOINT ["swarm"]

5
api/server.go
View File

@@ -14,6 +14,8 @@ import (
"github.com/docker/swarm/scheduler"
)
const DefaultDockerPort = ":2375"
func newUnixListener(addr string, tlsConfig *tls.Config) (net.Listener, error) {
if err := syscall.Unlink(addr); err != nil && !os.IsNotExist(err) {
return nil, err
@@ -43,6 +45,9 @@ func newUnixListener(addr string, tlsConfig *tls.Config) (net.Listener, error) {
func newListener(proto, addr string, tlsConfig *tls.Config) (net.Listener, error) {
l, err := net.Listen(proto, addr)
if err != nil {
if strings.Contains(err.Error(), "address already in use") && strings.Contains(addr, DefaultDockerPort) {
return nil, fmt.Errorf("%s: is Docker already running on this machine? Try using a different port", err)
}
return nil, err
}
if tlsConfig != nil {

2
flags.go
View File

@@ -17,7 +17,7 @@ var (
}
flHosts = cli.StringSliceFlag{
Name: "host, H",
Value: &cli.StringSlice{"tcp://127.0.0.1:4243"},
Value: &cli.StringSlice{"tcp://127.0.0.1:2375"},
Usage: "ip/socket to listen on",
EnvVar: "SWARM_HOST",
}