beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix docker daemon exit immediately after starting without -H option closes #16927

Browse source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
Lei Jitang 2015-10-12 04:49:25 -04:00
parent c45ad0b02d
commit e38767e197
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docker/daemon.go
View file

@ -224,6 +224,9 @@ func (cli *DaemonCli) CmdDaemon(args ...string) error {
defaultHost = opts.DefaultTLSHost
}
if len(commonFlags.Hosts) == 0 {
commonFlags.Hosts = make([]string, 1)
}
for i := 0; i < len(commonFlags.Hosts); i++ {
var err error
if commonFlags.Hosts[i], err = opts.ParseHost(defaultHost, commonFlags.Hosts[i]); err != nil {

8
integration-cli/docker_cli_daemon_test.go
View file

@ -1715,3 +1715,11 @@ func (s *DockerDaemonSuite) TestDaemonCorruptedFluentdAddress(c *check.C) {
c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err)
}
}
func (s *DockerDaemonSuite) TestDaemonStartWithoutHost(c *check.C) {
s.d.useDefaultHost = true
defer func() {
s.d.useDefaultHost = false
}()
c.Assert(s.d.Start(), check.IsNil)
}

26
integration-cli/docker_utils.go
View file

@ -49,6 +49,7 @@ type Daemon struct {
execDriver string
wait chan error
userlandProxy bool
useDefaultHost bool
}
// NewDaemon returns a Daemon instance to be used for testing.
@ -101,12 +102,13 @@ func (d *Daemon) Start(arg ...string) error {
args := append(d.GlobalFlags,
d.Command,
"--host", d.sock(),
"--graph", d.root,
"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
)
if !d.useDefaultHost {
args = append(args, []string{"--host", d.sock()}...)
}
if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
args = append(args, []string{"--userns-remap", root}...)
}
@ -168,7 +170,15 @@ func (d *Daemon) Start(arg ...string) error {
case <-time.After(2 * time.Second):
return fmt.Errorf("[%s] timeout: daemon does not respond", d.id)
case <-tick:
c, err := net.Dial("unix", filepath.Join(d.folder, "docker.sock"))
var (
c net.Conn
err error
)
if d.useDefaultHost {
c, err = net.Dial("unix", "/var/run/docker.sock")
} else {
c, err = net.Dial("unix", filepath.Join(d.folder, "docker.sock"))
}
if err != nil {
continue
}
@ -291,7 +301,15 @@ func (d *Daemon) Restart(arg ...string) error {
func (d *Daemon) queryRootDir() (string, error) {
// update daemon root by asking /info endpoint (to support user
// namespaced daemon with root remapped uid.gid directory)
conn, err := net.Dial("unix", filepath.Join(d.folder, "docker.sock"))
var (
conn net.Conn
err error
)
if d.useDefaultHost {
conn, err = net.Dial("unix", "/var/run/docker.sock")
} else {
conn, err = net.Dial("unix", filepath.Join(d.folder, "docker.sock"))
}
if err != nil {
return "", err
}