Fix case sensitivity issue Update docker and runc vendors Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@@ -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 (
@@ -10,9 +10,9 @@ import (
"fmt"
"github.com/docker/libnetwork/datastore"
// block sequence constants
@@ -22,7 +22,6 @@ import (
"github.com/docker/docker/pkg/discovery"
"github.com/docker/docker/pkg/reexec"
"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/gorilla/mux"
"golang.org/x/net/context"
@@ -5,9 +5,9 @@ import (
"os"
"syscall"
"github.com/docker/docker/pkg/signal"
"github.com/docker/docker/pkg/system"
// Copied over from docker/daemon/debugtrap_windows.go
@@ -4,8 +4,8 @@ import (
"github.com/codegangsta/cli"
var (
@@ -4,7 +4,6 @@ import (
"strings"
"github.com/BurntSushi/toml"
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-connections/tlsconfig"
@@ -13,6 +12,7 @@ import (
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/osl"
// Config encapsulates configurations of various Libnetwork components
@@ -52,7 +52,6 @@ import (
"time"
"github.com/docker/docker/pkg/locker"
@@ -69,6 +68,7 @@ import (
// NetworkController provides the interface for controller instance which manages
@@ -4,9 +4,9 @@ import (
@@ -6,7 +6,7 @@ import (
"net/http"
// HTTPHandlerFunc TODO
@@ -12,7 +12,6 @@ import (
"github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/driverapi"
@@ -24,6 +23,7 @@ import (
"github.com/docker/libnetwork/portmapper"
"github.com/vishvananda/netlink"
@@ -5,11 +5,11 @@ import (
"net"
@@ -4,7 +4,7 @@ import (
"github.com/docker/libnetwork/iptables"
type link struct {
@@ -6,8 +6,8 @@ import (
@@ -7,7 +7,7 @@ import (
// Enumeration type saying which versions of IP protocol to process.
@@ -3,9 +3,9 @@ package bridge
import (
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/docker/libnetwork/netutils"
"io/ioutil"
@@ -5,8 +5,8 @@ import (
@@ -7,8 +7,8 @@ import (
"path/filepath"
"github.com/docker/libnetwork/ns"
@@ -3,12 +3,12 @@ package ipvlan
// CreateEndpoint assigns the mac, ip and endpoint id for the new container
@@ -4,12 +4,12 @@ import (
type staticRoute struct {
@@ -3,7 +3,6 @@ package ipvlan
@@ -12,6 +11,7 @@ import (
// CreateNetwork the network for the specified driver type
"strconv"
@@ -3,9 +3,9 @@ package ipvlan
func (d *driver) network(nid string) *network {
@@ -3,13 +3,13 @@ package macvlan
@@ -4,11 +4,11 @@ import (
// Join method is invoked when a Sandbox is attached to an endpoint.
@@ -3,7 +3,6 @@ package macvlan
@@ -3,9 +3,9 @@ package macvlan
@@ -12,10 +12,10 @@ import (
const globalChain = "DOCKER-OVERLAY"
@@ -5,7 +5,7 @@ import (
"path"
var sysctlConf = map[string]string{
@@ -5,12 +5,12 @@ import (
type endpointTable map[string]*endpoint
@@ -14,7 +14,6 @@ import (
"github.com/docker/libnetwork/resolvconf"
"github.com/vishvananda/netlink/nl"
"github.com/vishvananda/netns"
"github.com/hashicorp/serf/serf"
type ovNotify struct {
@@ -5,10 +5,10 @@ import (
@@ -8,7 +8,6 @@ import (
@@ -17,6 +16,7 @@ import (
@@ -7,13 +7,13 @@ import (
"github.com/docker/libnetwork/idm"
"github.com/docker/libnetwork/common"
const ovPeerTable = "overlay_peer_table"
@@ -5,13 +5,13 @@ import (
"github.com/docker/docker/pkg/plugins"
"github.com/docker/libnetwork/drivers/remote/api"
type driver struct {
@@ -13,7 +13,6 @@ import (
@@ -23,6 +22,7 @@ import (
@@ -7,11 +7,11 @@ import (
@@ -10,8 +10,8 @@ import (
"os/exec"
@@ -9,8 +9,8 @@ import (
@@ -4,10 +4,10 @@ import (
@@ -18,6 +17,7 @@ import (
@@ -7,7 +7,6 @@ import (
@@ -16,6 +15,7 @@ import (
// XXX OVERLAY_SOLARIS
"github.com/Microsoft/hcsshim"
@@ -9,10 +9,10 @@ import (
@@ -8,12 +8,12 @@ import (
"encoding/json"
@@ -20,12 +20,12 @@ import (
// networkConfiguration for network specific configuration
"github.com/docker/libnetwork/ipamapi"
// Endpoint represents a logical connection between a network and a sandbox.
@@ -1,8 +1,8 @@
package libnetwork
const userChain = "DOCKER-USER"
mapset "github.com/deckarep/golang-set"
@@ -6,13 +6,13 @@ import (
"github.com/docker/libnetwork/bitseq"
"github.com/docker/libnetwork/ipamutils"
@@ -3,9 +3,9 @@ package ipam
// Key provides the Key to be used in KV Store
"github.com/docker/libnetwork/ipams/remote/api"
type allocator struct {
@@ -3,11 +3,11 @@ package windowsipam
"github.com/godbus/dbus"
// IPV defines the table string
@@ -10,7 +10,7 @@ import (
// Action signifies the iptable action.
@@ -14,7 +14,7 @@ import (
"unsafe"
"testing"
@@ -25,6 +24,7 @@ import (
"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runc/libcontainer/configs"
@@ -22,6 +21,7 @@ import (
"github.com/docker/libnetwork/testutils"
"github.com/docker/libnetwork/config"
@@ -21,6 +20,7 @@ import (
// A Network represents a logical connectivity zone that containers may
@@ -7,10 +7,10 @@ import (
"github.com/docker/libnetwork/drivers/windows"
"github.com/docker/libnetwork/ipams/windowsipam"
func executeInCompartment(compartmentID uint32, x func()) {
@@ -12,8 +12,8 @@ import (
"github.com/hashicorp/memberlist"
type delegate struct {
type eventDelegate struct {
@@ -10,12 +10,12 @@ import (
"github.com/armon/go-radix"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -9,7 +9,7 @@ import (
@@ -8,9 +8,9 @@ import (
@@ -14,10 +14,10 @@ import (
@@ -6,9 +6,9 @@ import (
"github.com/docker/libnetwork/portallocator"
type mapping struct {
@@ -8,10 +8,10 @@ import (
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/libnetwork/resolvconf/dns"
"github.com/miekg/dns"
// Resolver represents the embedded DNS server in Docker. It operates
@@ -9,9 +9,9 @@ import (
"runtime"
@@ -9,11 +9,11 @@ import (
"github.com/docker/libnetwork/etchosts"
// Sandbox provides the control over the network container entity. It is a one to one mapping with the container.
@@ -11,11 +11,11 @@ import (
const udsBase = "/run/docker/libnetwork/"
@@ -5,8 +5,8 @@ package libnetwork
func (c *controller) addEndpointNameResolution(svcName, svcID, nID, eID, containerName string, vip net.IP, serviceAliases, taskAliases []string, ip net.IP, addService bool, method string) error {
@@ -14,12 +14,12 @@ import (
"github.com/docker/libnetwork/ipvs"
"github.com/docker/libkv/store/boltdb"
"github.com/docker/libkv/store/consul"
"github.com/docker/libkv/store/etcd"
"github.com/docker/libkv/store/zookeeper"
func registerKVStores() {
@@ -12,7 +12,7 @@ import (
var servicePort string
"github.com/docker/libnetwork/diagnose"
"github.com/docker/libnetwork/test/networkDb/dummyclient"
var nDB *networkdb.NetworkDB