Merge pull request #21115 from wenchma/linkable
update link comments Upstream-commit: 20d5d10983b3e126427aa920d9f5ac8c68967c27 Component: engine
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user