Skip to content

Commit

Permalink
Not fail on updating parent links
Browse files Browse the repository at this point in the history
Fixes #8796

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
  • Loading branch information
LK4D4 committed Nov 6, 2014
1 parent 68a25a5 commit b83fc07
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion daemon/container.go
Expand Up @@ -987,7 +987,7 @@ func (container *Container) updateParentsHosts() error {
c := container.daemon.Get(cid)
if c != nil && !container.daemon.config.DisableNetwork && container.hostConfig.NetworkMode.IsPrivate() {
if err := etchosts.Update(c.HostsPath, container.NetworkSettings.IPAddress, container.Name[1:]); err != nil {
return fmt.Errorf("Failed to update /etc/hosts in parent container: %v", err)
log.Errorf("Failed to update /etc/hosts in parent container: %v", err)
}
}
}
Expand Down
20 changes: 20 additions & 0 deletions integration-cli/docker_cli_links_test.go
Expand Up @@ -157,3 +157,23 @@ func TestLinksInspectLinksStopped(t *testing.T) {

logDone("link - links in stopped container inspect")
}

func TestLinksNotStartedParentNotFail(t *testing.T) {
defer deleteAllContainers()
runCmd := exec.Command(dockerBinary, "create", "--name=first", "busybox", "top")
out, _, _, err := runCommandWithStdoutStderr(runCmd)
if err != nil {
t.Fatal(out, err)
}
runCmd = exec.Command(dockerBinary, "create", "--name=second", "--link=first:first", "busybox", "top")
out, _, _, err = runCommandWithStdoutStderr(runCmd)
if err != nil {
t.Fatal(out, err)
}
runCmd = exec.Command(dockerBinary, "start", "first")
out, _, _, err = runCommandWithStdoutStderr(runCmd)
if err != nil {
t.Fatal(out, err)
}
logDone("link - container start not failing on updating stopped parent links")
}

0 comments on commit b83fc07

Please sign in to comment.