diff --git a/libnetwork/Godeps/Godeps.json b/libnetwork/Godeps/Godeps.json index 57b67187ab..c3fe20f234 100644 --- a/libnetwork/Godeps/Godeps.json +++ b/libnetwork/Godeps/Godeps.json @@ -84,118 +84,118 @@ }, { "ImportPath": "github.com/docker/docker/api/types/filters", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/api/types/network", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/api/types/versions", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/opts", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/discovery", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/discovery/kv", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/homedir", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/ioutils", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/locker", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/longpath", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/mount", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/parsers/kernel", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" + }, + { + "ImportPath": "github.com/docker/docker/pkg/plugingetter", + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/plugins", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/plugins/transport", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/random", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/reexec", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/signal", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/stringid", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/symlink", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/system", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/term", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/docker/pkg/term/windows", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" - }, - { - "ImportPath": "github.com/docker/docker/plugin/getter", - "Comment": "docs-v1.12.0-rc4-2016-07-15-1792-g1de5043", - "Rev": "1de5043f4e7f4283909eac0f2268e701395d7ad9" + "Comment": "docs-v1.12.0-rc4-2016-07-15-1985-gfebf53d", + "Rev": "febf53d91a43fe13fbb802d9e6b7b6732183cf21" }, { "ImportPath": "github.com/docker/go-connections/sockets", diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/docker/plugin/getter/interface.go b/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/plugingetter/getter.go similarity index 96% rename from libnetwork/Godeps/_workspace/src/github.com/docker/docker/plugin/getter/interface.go rename to libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/plugingetter/getter.go index 12558437e6..cd8214cae9 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/docker/plugin/getter/interface.go +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/plugingetter/getter.go @@ -1,4 +1,4 @@ -package getter +package plugingetter import "github.com/docker/docker/pkg/plugins" diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go b/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go index 11a16fdea8..a91f07e482 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/docker/pkg/term/term_windows.go @@ -71,8 +71,8 @@ func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) { } } - if os.Getenv("ConEmuANSI") == "ON" { - // The ConEmu terminal emulates ANSI on output streams well. + if os.Getenv("ConEmuANSI") == "ON" || os.Getenv("ConsoleZVersion") != "" { + // The ConEmu and ConsoleZ terminals emulate ANSI on output streams well. emulateStdin = true emulateStdout = false emulateStderr = false diff --git a/libnetwork/cmd/ovrouter/ovrouter.go b/libnetwork/cmd/ovrouter/ovrouter.go index 538e28aaf4..0a4673c8af 100644 --- a/libnetwork/cmd/ovrouter/ovrouter.go +++ b/libnetwork/cmd/ovrouter/ovrouter.go @@ -6,8 +6,8 @@ import ( "os" "os/signal" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/reexec" - "github.com/docker/docker/plugin/getter" "github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/drivers/overlay" "github.com/docker/libnetwork/netlabel" @@ -25,7 +25,7 @@ type endpoint struct { name string } -func (r *router) GetPluginGetter() getter.PluginGetter { +func (r *router) GetPluginGetter() plugingetter.PluginGetter { return nil } diff --git a/libnetwork/config/config.go b/libnetwork/config/config.go index 0e4780e489..8c3af13b22 100644 --- a/libnetwork/config/config.go +++ b/libnetwork/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/discovery" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/go-connections/tlsconfig" "github.com/docker/libkv/store" "github.com/docker/libnetwork/cluster" @@ -21,7 +21,7 @@ type Config struct { Cluster ClusterCfg Scopes map[string]*datastore.ScopeCfg ActiveSandboxes map[string]interface{} - PluginGetter getter.PluginGetter + PluginGetter plugingetter.PluginGetter } // DaemonCfg represents libnetwork core configuration @@ -208,7 +208,7 @@ func OptionExecRoot(execRoot string) Option { } // OptionPluginGetter returns a plugingetter for remote drivers. -func OptionPluginGetter(pg getter.PluginGetter) Option { +func OptionPluginGetter(pg plugingetter.PluginGetter) Option { return func(c *Config) { c.PluginGetter = pg } diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 8c3c3a1eae..f7b527e3b5 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -53,9 +53,9 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/discovery" "github.com/docker/docker/pkg/locker" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/pkg/stringid" - "github.com/docker/docker/plugin/getter" "github.com/docker/libnetwork/cluster" "github.com/docker/libnetwork/config" "github.com/docker/libnetwork/datastore" @@ -582,7 +582,7 @@ func (c *controller) isDistributedControl() bool { return !c.isManager() && !c.isAgent() } -func (c *controller) GetPluginGetter() getter.PluginGetter { +func (c *controller) GetPluginGetter() plugingetter.PluginGetter { return c.drvRegistry.GetPluginGetter() } @@ -1059,7 +1059,7 @@ func (c *controller) loadDriver(networkType string) error { } func (c *controller) loadIPAMDriver(name string) error { - if _, err := c.GetPluginGetter().Get(name, ipamapi.PluginEndpointType, getter.LOOKUP); err != nil { + if _, err := c.GetPluginGetter().Get(name, ipamapi.PluginEndpointType, plugingetter.LOOKUP); err != nil { if err == plugins.ErrNotFound { return types.NotFoundErrorf(err.Error()) } diff --git a/libnetwork/driverapi/driverapi.go b/libnetwork/driverapi/driverapi.go index 51a43e780b..98bc60ac9d 100644 --- a/libnetwork/driverapi/driverapi.go +++ b/libnetwork/driverapi/driverapi.go @@ -3,7 +3,7 @@ package driverapi import ( "net" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libnetwork/discoverapi" ) @@ -141,7 +141,7 @@ type JoinInfo interface { // DriverCallback provides a Callback interface for Drivers into LibNetwork type DriverCallback interface { // GetPluginGetter returns the pluginv2 getter. - GetPluginGetter() getter.PluginGetter + GetPluginGetter() plugingetter.PluginGetter // RegisterDriver provides a way for Remote drivers to dynamically register new NetworkType and associate with a driver instance RegisterDriver(name string, driver Driver, capability Capability) error } diff --git a/libnetwork/drivers/ipvlan/ipvlan_test.go b/libnetwork/drivers/ipvlan/ipvlan_test.go index b4650f469a..207bfd2ab8 100644 --- a/libnetwork/drivers/ipvlan/ipvlan_test.go +++ b/libnetwork/drivers/ipvlan/ipvlan_test.go @@ -3,7 +3,7 @@ package ipvlan import ( "testing" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libnetwork/driverapi" _ "github.com/docker/libnetwork/testutils" ) @@ -15,7 +15,7 @@ type driverTester struct { d *driver } -func (dt *driverTester) GetPluginGetter() getter.PluginGetter { +func (dt *driverTester) GetPluginGetter() plugingetter.PluginGetter { return nil } diff --git a/libnetwork/drivers/macvlan/macvlan_test.go b/libnetwork/drivers/macvlan/macvlan_test.go index 76d73f65f2..f9a18d5b47 100644 --- a/libnetwork/drivers/macvlan/macvlan_test.go +++ b/libnetwork/drivers/macvlan/macvlan_test.go @@ -3,7 +3,7 @@ package macvlan import ( "testing" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libnetwork/driverapi" _ "github.com/docker/libnetwork/testutils" ) @@ -15,7 +15,7 @@ type driverTester struct { d *driver } -func (dt *driverTester) GetPluginGetter() getter.PluginGetter { +func (dt *driverTester) GetPluginGetter() plugingetter.PluginGetter { return nil } diff --git a/libnetwork/drivers/overlay/overlay_test.go b/libnetwork/drivers/overlay/overlay_test.go index c15886be7f..6d2127311d 100644 --- a/libnetwork/drivers/overlay/overlay_test.go +++ b/libnetwork/drivers/overlay/overlay_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libkv/store/consul" "github.com/docker/libnetwork/datastore" "github.com/docker/libnetwork/discoverapi" @@ -68,7 +68,7 @@ func cleanupDriver(t *testing.T, dt *driverTester) { } } -func (dt *driverTester) GetPluginGetter() getter.PluginGetter { +func (dt *driverTester) GetPluginGetter() plugingetter.PluginGetter { return nil } diff --git a/libnetwork/drvregistry/drvregistry.go b/libnetwork/drvregistry/drvregistry.go index af4dee4264..a9a7368025 100644 --- a/libnetwork/drvregistry/drvregistry.go +++ b/libnetwork/drvregistry/drvregistry.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libnetwork/driverapi" "github.com/docker/libnetwork/ipamapi" "github.com/docker/libnetwork/types" @@ -33,7 +33,7 @@ type DrvRegistry struct { ipamDrivers ipamTable dfn DriverNotifyFunc ifn IPAMNotifyFunc - pluginGetter getter.PluginGetter + pluginGetter plugingetter.PluginGetter } // Functors definition @@ -54,7 +54,7 @@ type IPAMNotifyFunc func(name string, driver ipamapi.Ipam, cap *ipamapi.Capabili type DriverNotifyFunc func(name string, driver driverapi.Driver, capability driverapi.Capability) error // New retruns a new driver registry handle. -func New(lDs, gDs interface{}, dfn DriverNotifyFunc, ifn IPAMNotifyFunc, pg getter.PluginGetter) (*DrvRegistry, error) { +func New(lDs, gDs interface{}, dfn DriverNotifyFunc, ifn IPAMNotifyFunc, pg plugingetter.PluginGetter) (*DrvRegistry, error) { r := &DrvRegistry{ drivers: make(driverTable), ipamDrivers: make(ipamTable), @@ -153,7 +153,7 @@ func (r *DrvRegistry) IPAMDefaultAddressSpaces(name string) (string, string, err } // GetPluginGetter returns the plugingetter -func (r *DrvRegistry) GetPluginGetter() getter.PluginGetter { +func (r *DrvRegistry) GetPluginGetter() plugingetter.PluginGetter { return r.pluginGetter } diff --git a/libnetwork/ipamapi/contract.go b/libnetwork/ipamapi/contract.go index 2800282ee0..090205e11f 100644 --- a/libnetwork/ipamapi/contract.go +++ b/libnetwork/ipamapi/contract.go @@ -4,7 +4,7 @@ package ipamapi import ( "net" - "github.com/docker/docker/plugin/getter" + "github.com/docker/docker/pkg/plugingetter" "github.com/docker/libnetwork/discoverapi" "github.com/docker/libnetwork/types" ) @@ -27,7 +27,7 @@ const ( // Callback provides a Callback interface for registering an IPAM instance into LibNetwork type Callback interface { // GetPluginGetter returns the pluginv2 getter. - GetPluginGetter() getter.PluginGetter + GetPluginGetter() plugingetter.PluginGetter // RegisterIpamDriver provides a way for Remote drivers to dynamically register with libnetwork RegisterIpamDriver(name string, driver Ipam) error // RegisterIpamDriverWithCapabilities provides a way for Remote drivers to dynamically register with libnetwork and specify capabilities