mirror of
https://github.com/clearlinux/docker.git
synced 2026-10-04 07:48:44 +00:00
Merge pull request #12406 from runcom/remove-job-container-inspect
Remove job from container_inspect
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user