Browse Source

Remove dead code

Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Aidan Hobson Sayers 9 năm trước cách đây
mục cha
commit
164d0bca63
1 tập tin đã thay đổi với 0 bổ sung17 xóa
  1. 0 17
      daemon/container_unix.go

+ 0 - 17
daemon/container_unix.go

@@ -30,7 +30,6 @@ import (
 	"github.com/docker/docker/utils"
 	"github.com/docker/docker/utils"
 	"github.com/docker/docker/volume"
 	"github.com/docker/docker/volume"
 	"github.com/docker/libnetwork"
 	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/drivers/bridge"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/netlabel"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/options"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
@@ -903,22 +902,6 @@ func (container *Container) buildCreateEndpointOptions(n libnetwork.Network) ([]
 	return createOptions, nil
 	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 {
 func (container *Container) allocateNetwork() error {
 	updateSettings := false
 	updateSettings := false
 	if len(container.NetworkSettings.Networks) == 0 {
 	if len(container.NetworkSettings.Networks) == 0 {