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

Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently 

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2015-08-29 03:05:18 +00:00 committed by Vincent Demeester
parent 59ffb24c8f
commit 2d2863ebd5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opts/hosts_windows.go
View File

@ -2,7 +2,5 @@
package opts package opts
import "fmt"
// DefaultHost constant defines the default host string used by docker on Windows // DefaultHost constant defines the default host string used by docker on Windows
var DefaultHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultHTTPPort) var DefaultHost = DefaultTCPHost

4
opts/opts.go
View File

@ -25,6 +25,8 @@ var (
// DefaultUnixSocket Path for the unix socket. // DefaultUnixSocket Path for the unix socket.
// Docker daemon by default always listens on the default unix socket // Docker daemon by default always listens on the default unix socket
DefaultUnixSocket = "/var/run/docker.sock" DefaultUnixSocket = "/var/run/docker.sock"
// DefaultTCPHost constant defines the default host string used by docker on Windows
DefaultTCPHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultHTTPPort)
) )
// ListOpts holds a list of values and a validation function. // ListOpts holds a list of values and a validation function.
@ -333,7 +335,7 @@ func ValidateLabel(val string) (string, error) {
// ValidateHost validates that the specified string is a valid host and returns it. // ValidateHost validates that the specified string is a valid host and returns it.
func ValidateHost(val string) (string, error) { func ValidateHost(val string) (string, error) {
host, err := parsers.ParseHost(DefaultHTTPHost, DefaultUnixSocket, val) host, err := parsers.ParseDockerDaemonHost(DefaultTCPHost, DefaultUnixSocket, val)
if err != nil { if err != nil {
return val, err return val, err
} }

3
opts/opts_test.go
View File

@ -441,7 +441,6 @@ func TestValidateHost(t *testing.T) {
"something with spaces": "Invalid bind address format: something with spaces", "something with spaces": "Invalid bind address format: something with spaces",
"://": "Invalid bind address format: ://", "://": "Invalid bind address format: ://",
"unknown://": "Invalid bind address format: unknown://", "unknown://": "Invalid bind address format: unknown://",
"tcp://": "Invalid proto, expected tcp: ",
"tcp://:port": "Invalid bind address format: :port", "tcp://:port": "Invalid bind address format: :port",
"tcp://invalid": "Invalid bind address format: invalid", "tcp://invalid": "Invalid bind address format: invalid",
"tcp://invalid:port": "Invalid bind address format: invalid:port", "tcp://invalid:port": "Invalid bind address format: invalid:port",
@ -449,6 +448,8 @@ func TestValidateHost(t *testing.T) {
valid := map[string]string{ valid := map[string]string{
"fd://": "fd://", "fd://": "fd://",
"fd://something": "fd://something", "fd://something": "fd://something",
"tcp://host:": "tcp://host:2375",
"tcp://": "tcp://127.0.0.1:2375",
"tcp://:2375": "tcp://127.0.0.1:2375", // default ip address "tcp://:2375": "tcp://127.0.0.1:2375", // default ip address
"tcp://:2376": "tcp://127.0.0.1:2376", // default ip address "tcp://:2376": "tcp://127.0.0.1:2376", // default ip address
"tcp://0.0.0.0:8080": "tcp://0.0.0.0:8080", "tcp://0.0.0.0:8080": "tcp://0.0.0.0:8080",