toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update link comments

Browse Source 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: c52a373bc8c914f41b0451964e15c007f2754436
Component: engine
This commit is contained in:
Wen Cheng Ma
2016-03-11 18:13:37 +08:00
parent 1ae186f482
commit 9bf044b2a7
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/container_operations.go
View File

@ -167,7 +167,7 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container, n libn
libnetwork.OptionPortMapping(pbList),
libnetwork.OptionExposedPorts(exposeList))
// Link feature is supported only for the default bridge network.
// Legacy Link feature is supported only for the default bridge network.
// return if this call to build join options is not for default bridge network
if n.Name() != defaultNetName {
return sboxOptions, nil

1
components/engine/daemon/daemon_unix.go
View File

@ -977,7 +977,6 @@ func (daemon *Daemon) registerLinks(container *container.Container, hostConfig *
}
child, err := daemon.GetContainer(name)
if err != nil {
//An error from daemon.GetContainer() means this name could not be found
return fmt.Errorf("Could not get container for %s", name)
}
for child.HostConfig.NetworkMode.IsContainer() {