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

Merge pull request #7745 from LK4D4/fix_docker_host_panic 

Fix panic for DOCKER_HOST without ://
This commit is contained in:
Michael Crosby 2014-08-26 11:23:30 -07:00
parent c4a190db0c 660cc4a267
commit b458dd1dfb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/docker.go
View File

@ -44,7 +44,8 @@ func main() {
// If we do not have a host, default to unix socket // If we do not have a host, default to unix socket
defaultHost = fmt.Sprintf("unix://%s", api.DEFAULTUNIXSOCKET) defaultHost = fmt.Sprintf("unix://%s", api.DEFAULTUNIXSOCKET)
} }
if _, err := api.ValidateHost(defaultHost); err != nil { defaultHost, err := api.ValidateHost(defaultHost)
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
flHosts = append(flHosts, defaultHost) flHosts = append(flHosts, defaultHost)