Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376

Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2015-10-11 15:35:04 -07:00
8 changed files with 63 additions and 21 deletions

View File

@ -82,13 +82,17 @@ then it is trivial for someone to gain root access to the host where the
daemon is running.
Similarly, the Docker client can use `-H` to connect to a custom port.
The Docker client will default to connecting to `unix:///var/run/docker.sock`
on Linux, and `tcp://127.0.0.1:2376` on Windows.
`-H` accepts host and port assignment in the following format:
tcp://[host][:port][path] or unix://path
tcp://[host]:[port][path] or unix://path
For example:
- `tcp://` -> TCP connection to `127.0.0.1` on either port `2376` when TLS encryption
is on, or port `2375` when communication is in plain text.
- `tcp://host:2375` -> TCP connection on
host:2375
- `tcp://host:2375/path` -> TCP connection on
@ -101,7 +105,7 @@ when no `-H` was passed in.
`-H` also accepts short form for TCP bindings:
host[:port] or :port
`host:` or `host:port` or `:port`
Run Docker in daemon mode: