Update logrus to v1.0.1

Fix case sensitivity issue
Update docker and runc vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan 2017-07-26 14:18:31 -07:00
parent f5ff00cba7
commit 43f00b74d7
189 changed files with 2843 additions and 1078 deletions

View File

@ -10,7 +10,6 @@ import (
"sort"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/go-events"
"github.com/docker/libnetwork/cluster"
@ -20,6 +19,7 @@ import (
"github.com/docker/libnetwork/networkdb"
"github.com/docker/libnetwork/types"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)
const (

View File

@ -10,9 +10,9 @@ import (
"fmt"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// block sequence constants

View File

@ -22,7 +22,6 @@ import (
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/reexec"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/pkg/term"
"github.com/docker/libnetwork"
@ -36,6 +35,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
"github.com/gorilla/mux"
"github.com/sirupsen/logrus"
"golang.org/x/net/context"
)

View File

@ -5,9 +5,9 @@ import (
"os"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/pkg/system"
"github.com/sirupsen/logrus"
)
// Copied over from docker/daemon/debugtrap_windows.go

View File

@ -4,8 +4,8 @@ import (
"fmt"
"os"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
"github.com/sirupsen/logrus"
)
var (

View File

@ -4,7 +4,6 @@ import (
"strings"
"github.com/BurntSushi/toml"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-connections/tlsconfig"
@ -13,6 +12,7 @@ import (
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
)
// Config encapsulates configurations of various Libnetwork components

View File

@ -52,7 +52,6 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/locker"
"github.com/docker/docker/pkg/plugingetter"
@ -69,6 +68,7 @@ import (
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// NetworkController provides the interface for controller instance which manages

View File

@ -4,9 +4,9 @@ import (
"fmt"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -6,7 +6,7 @@ import (
"net/http"
"sync"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
// HTTPHandlerFunc TODO

View File

@ -12,7 +12,6 @@ import (
"sync"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@ -24,6 +23,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/portmapper"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -5,11 +5,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -4,7 +4,7 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -4,9 +4,9 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type link struct {

View File

@ -6,8 +6,8 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
var (

View File

@ -7,7 +7,7 @@ import (
"os"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
// Enumeration type saying which versions of IP protocol to process.

View File

@ -3,9 +3,9 @@ package bridge
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/libnetwork/netutils"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -4,8 +4,8 @@ import (
"fmt"
"io/ioutil"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
)
const (

View File

@ -5,8 +5,8 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -7,8 +7,8 @@ import (
"net"
"path/filepath"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -6,8 +6,8 @@ import (
"net"
"os"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -4,9 +4,9 @@ import (
"fmt"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -3,12 +3,12 @@ package ipvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// CreateEndpoint assigns the mac, ip and endpoint id for the new container

View File

@ -4,12 +4,12 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type staticRoute struct {

View File

@ -3,7 +3,6 @@ package ipvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/driverapi"
@ -12,6 +11,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// CreateNetwork the network for the specified driver type

View File

@ -5,8 +5,8 @@ import (
"strconv"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -3,9 +3,9 @@ package ipvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
func (d *driver) network(nid string) *network {

View File

@ -5,11 +5,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -3,13 +3,13 @@ package macvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// CreateEndpoint assigns the mac, ip and endpoint id for the new container

View File

@ -4,11 +4,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
)
// Join method is invoked when a Sandbox is attached to an endpoint.

View File

@ -3,7 +3,6 @@ package macvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/driverapi"
@ -12,6 +11,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// CreateNetwork the network for the specified driver type

View File

@ -5,8 +5,8 @@ import (
"strconv"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -3,9 +3,9 @@ package macvlan
import (
"fmt"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
func (d *driver) network(nid string) *network {

View File

@ -5,11 +5,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -12,10 +12,10 @@ import (
"strconv"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -4,8 +4,8 @@ import (
"fmt"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
)
const globalChain = "DOCKER-OVERLAY"

View File

@ -5,11 +5,11 @@ import (
"net"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)
// Join method is invoked when a Sandbox is attached to an endpoint.

View File

@ -5,7 +5,7 @@ import (
"path"
"strings"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
var sysctlConf = map[string]string{

View File

@ -5,12 +5,12 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type endpointTable map[string]*endpoint

View File

@ -14,7 +14,6 @@ import (
"syscall"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/driverapi"
@ -24,6 +23,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns"

View File

@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/hashicorp/serf/serf"
"github.com/sirupsen/logrus"
)
type ovNotify struct {

View File

@ -5,10 +5,10 @@ import (
"strings"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

View File

@ -8,7 +8,6 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@ -17,6 +16,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/hashicorp/serf/serf"
"github.com/sirupsen/logrus"
)
const (

View File

@ -7,13 +7,13 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/idm"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -7,8 +7,8 @@ import (
"sync"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/common"
"github.com/sirupsen/logrus"
)
const ovPeerTable = "overlay_peer_table"

View File

@ -5,13 +5,13 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/drivers/remote/api"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type driver struct {

View File

@ -13,7 +13,6 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@ -23,6 +22,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/portmapper"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -7,11 +7,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -10,8 +10,8 @@ import (
"os"
"os/exec"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
var (

View File

@ -9,8 +9,8 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -4,10 +4,10 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/types"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)
// Join method is invoked when a Sandbox is attached to an endpoint.

View File

@ -5,11 +5,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type endpointTable map[string]*endpoint

View File

@ -10,7 +10,6 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
@ -18,6 +17,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
var (

View File

@ -6,8 +6,8 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/hashicorp/serf/serf"
"github.com/sirupsen/logrus"
)
type ovNotify struct {

View File

@ -7,7 +7,6 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@ -16,6 +15,7 @@ import (
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/hashicorp/serf/serf"
"github.com/sirupsen/logrus"
)
// XXX OVERLAY_SOLARIS

View File

@ -7,13 +7,13 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/idm"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -5,7 +5,7 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
const ovPeerTable = "overlay_peer_table"

View File

@ -4,10 +4,10 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/types"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)
// Join method is invoked when a Sandbox is attached to an endpoint.

View File

@ -6,8 +6,8 @@ import (
"net"
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/sirupsen/logrus"
)
type endpointTable map[string]*endpoint

View File

@ -9,10 +9,10 @@ import (
"sync"
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
var (

View File

@ -8,12 +8,12 @@ import (
"sync"
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -6,8 +6,8 @@ import (
"encoding/json"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/Microsoft/hcsshim"
)

View File

@ -20,12 +20,12 @@ import (
"sync"
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// networkConfiguration for network specific configuration

View File

@ -7,11 +7,11 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -8,12 +8,12 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// Endpoint represents a logical connection between a network and a sandbox.

View File

@ -1,8 +1,8 @@
package libnetwork
import (
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
)
const userChain = "DOCKER-USER"

View File

@ -4,7 +4,7 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
mapset "github.com/deckarep/golang-set"
"github.com/docker/docker/pkg/discovery"

View File

@ -6,13 +6,13 @@ import (
"sort"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/bitseq"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/ipamutils"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -3,9 +3,9 @@ package ipam
import (
"encoding/json"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// Key provides the Key to be used in KV Store

View File

@ -4,12 +4,12 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/ipams/remote/api"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
type allocator struct {

View File

@ -3,11 +3,11 @@ package windowsipam
import (
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -5,7 +5,7 @@ import (
"net"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -4,8 +4,8 @@ import (
"fmt"
"strings"
"github.com/Sirupsen/logrus"
"github.com/godbus/dbus"
"github.com/sirupsen/logrus"
)
// IPV defines the table string

View File

@ -10,7 +10,7 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
// Action signifies the iptable action.

View File

@ -14,7 +14,7 @@ import (
"syscall"
"unsafe"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns"
)

View File

@ -14,7 +14,6 @@ import (
"strings"
"testing"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/ipamapi"
@ -25,6 +24,7 @@ import (
"github.com/docker/libnetwork/types"
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

View File

@ -10,7 +10,6 @@ import (
"sync"
"testing"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/plugins"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork"
@ -22,6 +21,7 @@ import (
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/testutils"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netns"
)

View File

@ -8,7 +8,6 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/stringid"
"github.com/docker/libnetwork/common"
"github.com/docker/libnetwork/config"
@ -21,6 +20,7 @@ import (
"github.com/docker/libnetwork/networkdb"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// A Network represents a logical connectivity zone that containers may

View File

@ -7,10 +7,10 @@ import (
"time"
"github.com/Microsoft/hcsshim"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/drivers/windows"
"github.com/docker/libnetwork/ipamapi"
"github.com/docker/libnetwork/ipams/windowsipam"
"github.com/sirupsen/logrus"
)
func executeInCompartment(compartmentID uint32, x func()) {

View File

@ -12,8 +12,8 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/hashicorp/memberlist"
"github.com/sirupsen/logrus"
)
const (

View File

@ -5,8 +5,8 @@ import (
"net"
"strings"
"github.com/Sirupsen/logrus"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
)
type delegate struct {

View File

@ -4,8 +4,8 @@ import (
"encoding/json"
"net"
"github.com/Sirupsen/logrus"
"github.com/hashicorp/memberlist"
"github.com/sirupsen/logrus"
)
type eventDelegate struct {

View File

@ -10,12 +10,12 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/armon/go-radix"
"github.com/docker/go-events"
"github.com/docker/libnetwork/types"
"github.com/hashicorp/memberlist"
"github.com/hashicorp/serf/serf"
"github.com/sirupsen/logrus"
)
const (

View File

@ -10,8 +10,8 @@ import (
"testing"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/go-events"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

View File

@ -9,7 +9,7 @@ import (
"syscall"
"time"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

View File

@ -8,9 +8,9 @@ import (
"syscall"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

View File

@ -14,10 +14,10 @@ import (
"syscall"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/ns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
"github.com/vishvananda/netns"
)

View File

@ -5,7 +5,7 @@ import (
"fmt"
"net"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink"
)

View File

@ -6,9 +6,9 @@ import (
"net"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/portallocator"
"github.com/sirupsen/logrus"
)
type mapping struct {

View File

@ -8,10 +8,10 @@ import (
"strings"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/libnetwork/resolvconf/dns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
var (

View File

@ -8,9 +8,9 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/miekg/dns"
"github.com/sirupsen/logrus"
)
// Resolver represents the embedded DNS server in Docker. It operates

View File

@ -9,9 +9,9 @@ import (
"os/exec"
"runtime"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/iptables"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netns"
)

View File

@ -9,11 +9,11 @@ import (
"sync"
"time"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/etchosts"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
// Sandbox provides the control over the network container entity. It is a one to one mapping with the container.

View File

@ -11,11 +11,11 @@ import (
"strconv"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/etchosts"
"github.com/docker/libnetwork/resolvconf"
"github.com/docker/libnetwork/resolvconf/dns"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)
const (

View File

@ -10,9 +10,9 @@ import (
"net"
"os"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/types"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/sirupsen/logrus"
)
const udsBase = "/run/docker/libnetwork/"

View File

@ -5,9 +5,9 @@ import (
"encoding/json"
"sync"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/datastore"
"github.com/docker/libnetwork/osl"
"github.com/sirupsen/logrus"
)
const (

View File

@ -5,8 +5,8 @@ package libnetwork
import (
"net"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/common"
"github.com/sirupsen/logrus"
)
func (c *controller) addEndpointNameResolution(svcName, svcID, nID, eID, containerName string, vip net.IP, serviceAliases, taskAliases []string, ip net.IP, addService bool, method string) error {

View File

@ -14,12 +14,12 @@ import (
"sync"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/libnetwork/iptables"
"github.com/docker/libnetwork/ipvs"
"github.com/docker/libnetwork/ns"
"github.com/gogo/protobuf/proto"
"github.com/sirupsen/logrus"
"github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns"
)

View File

@ -4,12 +4,12 @@ import (
"fmt"
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/libkv/store/boltdb"
"github.com/docker/libkv/store/consul"
"github.com/docker/libkv/store/etcd"
"github.com/docker/libkv/store/zookeeper"
"github.com/docker/libnetwork/datastore"
"github.com/sirupsen/logrus"
)
func registerKVStores() {

View File

@ -12,7 +12,7 @@ import (
"strings"
"time"
"github.com/Sirupsen/logrus"
"github.com/sirupsen/logrus"
)
var servicePort string

View File

@ -9,10 +9,10 @@ import (
"os"
"strconv"
"github.com/Sirupsen/logrus"
"github.com/docker/libnetwork/diagnose"
"github.com/docker/libnetwork/networkdb"
"github.com/docker/libnetwork/test/networkDb/dummyclient"
"github.com/sirupsen/logrus"
)
var nDB *networkdb.NetworkDB

Some files were not shown because too many files have changed in this diff Show More