move dockerhost into global config

config.go

@@ -1,13 +1,23 @@
 package main
 
+import (
+	"os"
+)
+
 type Config struct {
-	sortField string
+	dockerHost string
+	sortField  string
 }
 
 var DefaultConfig = NewDefaultConfig()
 
 func NewDefaultConfig() Config {
+	docker := os.Getenv("DOCKER_HOST")
+	if docker == "" {
+		docker = "unix:///var/run/docker.sock"
+	}
 	return Config{
-		sortField: "id",
+		dockerHost: docker,
+		sortField:  "id",
 	}
 }

containermap.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"os"
 	"strings"
 
 	"github.com/fsouza/go-dockerclient"
@@ -12,18 +11,16 @@ var filters = map[string][]string{
 }
 
 func NewContainerMap() *ContainerMap {
+	config := DefaultConfig
+
 	// init docker client
-	host := os.Getenv("DOCKER_HOST")
+	client, err := docker.NewClient(config.dockerHost)
-	if host == "" {
-		host = "unix:///var/run/docker.sock"
-	}
-	client, err := docker.NewClient(host)
 	if err != nil {
 		panic(err)
 	}
 
 	cm := &ContainerMap{
-		config:     DefaultConfig,
+		config:     config,
 		client:     client,
 		containers: make(map[string]*Container),
 	}