docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity

Change the default Host affectation to not rely on slice

Browse Source 
Upstream-commit: 5e3f6e7023fbd0cfd1233a99c332801755340cfb
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-11-26 17:50:43 +00:00
parent 8567f00b02
commit 9ed97e9dc0
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
components/engine/docker/docker.go
View File

@@ -38,10 +38,8 @@ func main() {
flDefaultIp = flag.String("ip", "0.0.0.0", "Default IP address to use when binding container ports")
flInterContainerComm = flag.Bool("icc", true, "Enable inter-container communication")
flGraphDriver = flag.String("s", "", "Force the docker runtime to use a specific storage driver")
flHosts = docker.ListOpts{}
flHosts = docker.NewListOpts(docker.ValidateHost)
)
flHosts.Set(fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET))
flag.Var(&flHosts, "H", "Multiple tcp://host:port or unix://path/to/socket to bind in daemon mode, single connection otherwise")
flag.Parse()
@@ -50,17 +48,9 @@ func main() {
showVersion()
return
}
// if flHosts.Len() > 1 {
// flHosts = flHosts[1:] //trick to display a nice default value in the usage
// }
for _, flHost := range flHosts.GetAll() {
host, err := utils.ParseHost(docker.DEFAULTHTTPHOST, docker.DEFAULTHTTPPORT, flHost)
if err == nil {
flHosts.Set(host)
flHosts.Delete(flHost)
} else {
log.Fatal(err)
}
if flHosts.Len() == 0 {
// If we do not have a host, default to unix socket
flHosts.Set(fmt.Sprintf("unix://%s", docker.DEFAULTUNIXSOCKET))
}
if *flDebug {