Merge pull request #12406 from runcom/remove-job-container-inspect

Remove job from container_inspect
This commit is contained in:
Brian Goff
2015-04-22 21:05:15 -04:00
13 changed files with 186 additions and 163 deletions
+2 -2
View File
@@ -20,7 +20,7 @@ import (
"strings"
"time"
"github.com/docker/docker/api"
"github.com/docker/docker/opts"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/stringutils"
"github.com/go-check/check"
@@ -274,7 +274,7 @@ func (d *Daemon) LogfileName() string {
}
func daemonHost() string {
daemonUrlStr := "unix://" + api.DEFAULTUNIXSOCKET
daemonUrlStr := "unix://" + opts.DefaultUnixSocket
if daemonHostVar := os.Getenv("DOCKER_HOST"); daemonHostVar != "" {
daemonUrlStr = daemonHostVar
}