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

Remove dead code

Browse Source 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 164d0bca63b74e6e0deeceee17b55c044f8d274e
Component: engine
This commit is contained in:
Aidan Hobson Sayers
2015-10-29 16:54:32 +00:00
parent d488544828
commit 0b3d47d91e
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/engine/daemon/container_unix.go
View File

@ -30,7 +30,6 @@ import (
"github.com/docker/docker/utils"
"github.com/docker/docker/volume"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/drivers/bridge"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
@ -903,22 +902,6 @@ func (container *Container) buildCreateEndpointOptions(n libnetwork.Network) ([]
return createOptions, nil
}
func createNetwork(controller libnetwork.NetworkController, dnet string, driver string) (libnetwork.Network, error) {
createOptions := []libnetwork.NetworkOption{}
genericOption := options.Generic{}
// Bridge driver is special due to legacy reasons
if runconfig.NetworkMode(driver).IsBridge() {
genericOption[netlabel.GenericData] = map[string]string{
bridge.BridgeName: dnet,
}
networkOption := libnetwork.NetworkOptionGeneric(genericOption)
createOptions = append(createOptions, networkOption)
}
return controller.NewNetwork(driver, dnet, createOptions...)
}
func (container *Container) allocateNetwork() error {
updateSettings := false
if len(container.NetworkSettings.Networks) == 0 {