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

Merge pull request #19242 from mavenugo/nsalias

Browse Source 
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
This commit is contained in:
David Calavera
2016-01-14 10:58:51 -08:00
parent ded6ab4c78 8eb1087397
commit 082c746378
14 changed files with 237 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/container_operations_unix.go
+4
View File
@@ -761,6 +761,10 @@ func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName
return runconfig.ErrUnsupportedNetworkAndIP
}
if !containertypes.NetworkMode(idOrName).IsUserDefined() && len(endpointConfig.Aliases) > 0 {
return runconfig.ErrUnsupportedNetworkAndAlias
}
controller := daemon.netController
if err := validateNetworkingConfig(n, endpointConfig); err != nil {