From 0b3d47d91e7eb55be04502a091c7151cda79b441 Mon Sep 17 00:00:00 2001 From: Aidan Hobson Sayers Date: Thu, 29 Oct 2015 16:54:32 +0000 Subject: [PATCH] Remove dead code Signed-off-by: Aidan Hobson Sayers Upstream-commit: 164d0bca63b74e6e0deeceee17b55c044f8d274e Component: engine --- components/engine/daemon/container_unix.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/components/engine/daemon/container_unix.go b/components/engine/daemon/container_unix.go index fb6695cc3e..3748263a38 100644 --- a/components/engine/daemon/container_unix.go +++ b/components/engine/daemon/container_unix.go @@ -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 {