diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 61924acea2..39b4a2951a 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -1,14 +1,14 @@ # the following lines are in sorted order, FYI -github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62 -github.com/Microsoft/hcsshim v0.5.25 +github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e +github.com/Microsoft/hcsshim v0.6.1 github.com/Microsoft/go-winio v0.4.2 -github.com/moby/buildkit fed5c1d9cee6f734f58f3addca6e8d1750df48a6 +github.com/moby/buildkit da2b9dc7dab99e824b2b1067ad7d0523e32dd2d9 https://github.com/dmcgowan/buildkit.git github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git github.com/gorilla/context v1.1 github.com/gorilla/mux v1.1 -github.com/jhowardmsft/opengcs v0.0.9 +github.com/jhowardmsft/opengcs b9d0120d36f26e981a50bf18bac1bb3f0c2b8fef https://github.com/dmcgowan/opengcs.git github.com/kr/pty 5cf931ef8f github.com/mattn/go-shellwords v1.0.3 github.com/sirupsen/logrus v1.0.1 @@ -27,8 +27,8 @@ github.com/imdario/mergo 0.2.1 golang.org/x/sync de49d9dcd27d4f764488181bea099dfe6179bcf0 #get libnetwork packages -github.com/docker/libnetwork e23c06b2917c82f6eed18c368f515060af78a09f -github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894 +github.com/docker/libnetwork 248fd5ea6a67f8810da322e6e7441e8de96a9045 https://github.com/dmcgowan/libnetwork.git +github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b @@ -51,7 +51,7 @@ github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904 github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7 # get graph and distribution packages -github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621 +github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c github.com/vbatts/tar-split v0.10.1 github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb @@ -62,7 +62,7 @@ github.com/pborman/uuid v1.0 google.golang.org/grpc v1.3.0 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly -github.com/opencontainers/runc 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 https://github.com/docker/runc +github.com/opencontainers/runc e9325d442f5979c4f79bfa9e09bdf7abb74ba03b https://github.com/dmcgowan/runc.git github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13 github.com/opencontainers/runtime-spec d42f1eb741e6361e858d83fc75aa6893b66292c4 # specs @@ -101,13 +101,13 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 # containerd -github.com/containerd/containerd 3addd840653146c90a254301d6c3a663c7fd6429 +github.com/containerd/containerd fc10004571bb9b26695ccbf2dd4a83213f60b93e https://github.com/dmcgowan/containerd.git github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4 github.com/stevvooe/continuity cd7a8e21e2b6f84799f5dd4b65faf49c8d3ee02d github.com/tonistiigi/fsutil 0ac4c11b053b9c5c7c47558f81f96c7100ce50fb # cluster -github.com/docker/swarmkit 3e2dd3c0a76149b1620b42d28dd6ff48270404e5 +github.com/docker/swarmkit 8bdecc57887ffc598b63d6433f58e0d2852112c3 https://github.com/dmcgowan/swarmkit.git github.com/gogo/protobuf v0.4 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e diff --git a/components/engine/vendor/github.com/Azure/go-ansiterm/README.md b/components/engine/vendor/github.com/Azure/go-ansiterm/README.md index e25e382101..261c041e7a 100644 --- a/components/engine/vendor/github.com/Azure/go-ansiterm/README.md +++ b/components/engine/vendor/github.com/Azure/go-ansiterm/README.md @@ -7,3 +7,6 @@ For example the parser might receive "ESC, [, A" as a stream of three characters The parser (parser.go) is a partial implementation of this state machine (http://vt100.net/emu/vt500_parser.png). There are also two event handler implementations, one for tests (test_event_handler.go) to validate that the expected events are being produced and called, the other is a Windows implementation (winterm/win_event_handler.go). See parser_test.go for examples exercising the state machine and generating appropriate function calls. + +----- +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. diff --git a/components/engine/vendor/github.com/Azure/go-ansiterm/parser.go b/components/engine/vendor/github.com/Azure/go-ansiterm/parser.go index 169f68dbef..3286a9cb5e 100644 --- a/components/engine/vendor/github.com/Azure/go-ansiterm/parser.go +++ b/components/engine/vendor/github.com/Azure/go-ansiterm/parser.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var logger *logrus.Logger diff --git a/components/engine/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go b/components/engine/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go index 4d858ed611..48998bb051 100644 --- a/components/engine/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go +++ b/components/engine/vendor/github.com/Azure/go-ansiterm/winterm/win_event_handler.go @@ -9,7 +9,7 @@ import ( "strconv" "github.com/Azure/go-ansiterm" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var logger *logrus.Logger diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/activatelayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/activatelayer.go index efc4d8029c..6d824d7a79 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/activatelayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/activatelayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // ActivateLayer will find the layer with the given id and mount it's filesystem. // For a read/write layer, the mounted filesystem will appear as a volume on the diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/container.go b/components/engine/vendor/github.com/Microsoft/hcsshim/container.go index 8bc7d6d2b7..b924d39f46 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/container.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/container.go @@ -8,7 +8,7 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var ( @@ -16,9 +16,10 @@ var ( ) const ( - pendingUpdatesQuery = `{ "PropertyTypes" : ["PendingUpdates"]}` - statisticsQuery = `{ "PropertyTypes" : ["Statistics"]}` - processListQuery = `{ "PropertyTypes" : ["ProcessList"]}` + pendingUpdatesQuery = `{ "PropertyTypes" : ["PendingUpdates"]}` + statisticsQuery = `{ "PropertyTypes" : ["Statistics"]}` + processListQuery = `{ "PropertyTypes" : ["ProcessList"]}` + mappedVirtualDiskQuery = `{ "PropertyTypes" : ["MappedVirtualDisk"]}` ) type container struct { @@ -30,20 +31,21 @@ type container struct { // ContainerProperties holds the properties for a container and the processes running in that container type ContainerProperties struct { - ID string `json:"Id"` - Name string - SystemType string - Owner string - SiloGUID string `json:"SiloGuid,omitempty"` - RuntimeID string `json:"RuntimeId,omitempty"` - IsRuntimeTemplate bool `json:",omitempty"` - RuntimeImagePath string `json:",omitempty"` - Stopped bool `json:",omitempty"` - ExitType string `json:",omitempty"` - AreUpdatesPending bool `json:",omitempty"` - ObRoot string `json:",omitempty"` - Statistics Statistics `json:",omitempty"` - ProcessList []ProcessListItem `json:",omitempty"` + ID string `json:"Id"` + Name string + SystemType string + Owner string + SiloGUID string `json:"SiloGuid,omitempty"` + RuntimeID string `json:"RuntimeId,omitempty"` + IsRuntimeTemplate bool `json:",omitempty"` + RuntimeImagePath string `json:",omitempty"` + Stopped bool `json:",omitempty"` + ExitType string `json:",omitempty"` + AreUpdatesPending bool `json:",omitempty"` + ObRoot string `json:",omitempty"` + Statistics Statistics `json:",omitempty"` + ProcessList []ProcessListItem `json:",omitempty"` + MappedVirtualDiskControllers map[int]MappedVirtualDiskController `json:",omitempty"` } // MemoryStats holds the memory statistics for a container @@ -103,6 +105,11 @@ type ProcessListItem struct { UserTime100ns uint64 `json:",omitempty"` } +// MappedVirtualDiskController is the structure of an item returned by a MappedVirtualDiskList call on a container +type MappedVirtualDiskController struct { + MappedVirtualDisks map[int]MappedVirtualDisk `json:",omitempty"` +} + // Type of Request Support in ModifySystem type RequestType string @@ -487,6 +494,55 @@ func (container *container) ProcessList() ([]ProcessListItem, error) { return properties.ProcessList, nil } +// MappedVirtualDisks returns a map of the controllers and the disks mapped +// to a container. +// +// Example of JSON returned by the query. +//{ +// "Id":"1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3_svm", +// "SystemType":"Container", +// "RuntimeOsType":"Linux", +// "RuntimeId":"00000000-0000-0000-0000-000000000000", +// "State":"Running", +// "MappedVirtualDiskControllers":{ +// "0":{ +// "MappedVirtualDisks":{ +// "2":{ +// "HostPath":"C:\\lcow\\lcow\\scratch\\1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3.vhdx", +// "ContainerPath":"/mnt/gcs/LinuxServiceVM/scratch", +// "Lun":2, +// "CreateInUtilityVM":true +// }, +// "3":{ +// "HostPath":"C:\\lcow\\lcow\\1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3\\sandbox.vhdx", +// "Lun":3, +// "CreateInUtilityVM":true, +// "AttachOnly":true +// } +// } +// } +// } +//} +func (container *container) MappedVirtualDisks() (map[int]MappedVirtualDiskController, error) { + container.handleLock.RLock() + defer container.handleLock.RUnlock() + operation := "MappedVirtualDiskList" + title := "HCSShim::Container::" + operation + logrus.Debugf(title+" id=%s", container.id) + + if container.handle == 0 { + return nil, makeContainerError(container, operation, "", ErrAlreadyClosed) + } + + properties, err := container.properties(mappedVirtualDiskQuery) + if err != nil { + return nil, makeContainerError(container, operation, "", err) + } + + logrus.Debugf(title+" succeeded id=%s", container.id) + return properties.MappedVirtualDiskControllers, nil +} + // Pause pauses the execution of the container. This feature is not enabled in TP5. func (container *container) Pause() error { container.handleLock.RLock() diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/createlayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/createlayer.go index 9ecffb1cb0..035d9c3947 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/createlayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/createlayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // CreateLayer creates a new, empty, read-only layer on the filesystem based on // the parent layer provided. diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go index b69c3da368..7a6a8854cf 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/createsandboxlayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // CreateSandboxLayer creates and populates new read-write layer for use by a container. // This requires both the id of the direct parent layer, as well as the full list diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/deactivatelayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/deactivatelayer.go index c02bcb3a0b..fd785030fb 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/deactivatelayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/deactivatelayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // DeactivateLayer will dismount a layer that was mounted via ActivateLayer. func DeactivateLayer(info DriverInfo, id string) error { diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/destroylayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/destroylayer.go index 91ed269eef..b1e3b89fc7 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/destroylayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/destroylayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // DestroyLayer will remove the on-disk files representing the layer with the given // id, including that layer's containing folder, if any. diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go b/components/engine/vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go index e168921841..6946c6a84f 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/expandsandboxsize.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // ExpandSandboxSize expands the size of a layer to at least size bytes. func ExpandSandboxSize(info DriverInfo, layerId string, size uint64) error { diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/exportlayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/exportlayer.go index 3c9b24ea6b..d7025f20ba 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/exportlayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/exportlayer.go @@ -7,7 +7,7 @@ import ( "syscall" "github.com/Microsoft/go-winio" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // ExportLayer will create a folder at exportFolderPath and fill that folder with diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/getlayermountpath.go b/components/engine/vendor/github.com/Microsoft/hcsshim/getlayermountpath.go index 41b5758926..89f8079d0f 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/getlayermountpath.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/getlayermountpath.go @@ -3,7 +3,7 @@ package hcsshim import ( "syscall" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // GetLayerMountPath will look for a mounted layer with the given id and return diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go b/components/engine/vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go index 01ab4da3dd..05d3d9532a 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/getsharedbaseimages.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // GetSharedBaseImages will enumerate the images stored in the common central // image store and return descriptive info about those images for the purpose diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hcsshim.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hcsshim.go index 3cb3a299ff..236ba1fa30 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/hcsshim.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hcsshim.go @@ -8,7 +8,7 @@ import ( "syscall" "unsafe" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) //go:generate go run mksyscall_windows.go -output zhcsshim.go hcsshim.go diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hnsendpoint.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsendpoint.go new file mode 100644 index 0000000000..07c6a7bc36 --- /dev/null +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsendpoint.go @@ -0,0 +1,183 @@ +package hcsshim + +import ( + "encoding/json" + "fmt" + "net" + + "github.com/sirupsen/logrus" +) + +// HNSEndpoint represents a network endpoint in HNS +type HNSEndpoint struct { + Id string `json:"ID,omitempty"` + Name string `json:",omitempty"` + VirtualNetwork string `json:",omitempty"` + VirtualNetworkName string `json:",omitempty"` + Policies []json.RawMessage `json:",omitempty"` + MacAddress string `json:",omitempty"` + IPAddress net.IP `json:",omitempty"` + DNSSuffix string `json:",omitempty"` + DNSServerList string `json:",omitempty"` + GatewayAddress string `json:",omitempty"` + EnableInternalDNS bool `json:",omitempty"` + DisableICC bool `json:",omitempty"` + PrefixLength uint8 `json:",omitempty"` + IsRemoteEndpoint bool `json:",omitempty"` +} + +// HNSEndpointRequest makes a HNS call to modify/query a network endpoint +func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) { + endpoint := &HNSEndpoint{} + err := hnsCall(method, "/endpoints/"+path, request, &endpoint) + if err != nil { + return nil, err + } + + return endpoint, nil +} + +// HNSListEndpointRequest makes a HNS call to query the list of available endpoints +func HNSListEndpointRequest() ([]HNSEndpoint, error) { + var endpoint []HNSEndpoint + err := hnsCall("GET", "/endpoints/", "", &endpoint) + if err != nil { + return nil, err + } + + return endpoint, nil +} + +// HotAttachEndpoint makes a HCS Call to attach the endpoint to the container +func HotAttachEndpoint(containerID string, endpointID string) error { + return modifyNetworkEndpoint(containerID, endpointID, Add) +} + +// HotDetachEndpoint makes a HCS Call to detach the endpoint from the container +func HotDetachEndpoint(containerID string, endpointID string) error { + return modifyNetworkEndpoint(containerID, endpointID, Remove) +} + +// ModifyContainer corresponding to the container id, by sending a request +func modifyContainer(id string, request *ResourceModificationRequestResponse) error { + container, err := OpenContainer(id) + if err != nil { + if IsNotExist(err) { + return ErrComputeSystemDoesNotExist + } + return getInnerError(err) + } + defer container.Close() + err = container.Modify(request) + if err != nil { + if IsNotSupported(err) { + return ErrPlatformNotSupported + } + return getInnerError(err) + } + + return nil +} + +func modifyNetworkEndpoint(containerID string, endpointID string, request RequestType) error { + requestMessage := &ResourceModificationRequestResponse{ + Resource: Network, + Request: request, + Data: endpointID, + } + err := modifyContainer(containerID, requestMessage) + + if err != nil { + return err + } + + return nil +} + +// GetHNSEndpointByID +func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) { + return HNSEndpointRequest("GET", endpointID, "") +} + +// GetHNSNetworkName filtered by Name +func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) { + hnsResponse, err := HNSListEndpointRequest() + if err != nil { + return nil, err + } + for _, hnsEndpoint := range hnsResponse { + if hnsEndpoint.Name == endpointName { + return &hnsEndpoint, nil + } + } + return nil, fmt.Errorf("Endpoint %v not found", endpointName) +} + +// Create Endpoint by sending EndpointRequest to HNS. TODO: Create a separate HNS interface to place all these methods +func (endpoint *HNSEndpoint) Create() (*HNSEndpoint, error) { + operation := "Create" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s", endpoint.Id) + + jsonString, err := json.Marshal(endpoint) + if err != nil { + return nil, err + } + return HNSEndpointRequest("POST", "", string(jsonString)) +} + +// Delete Endpoint by sending EndpointRequest to HNS +func (endpoint *HNSEndpoint) Delete() (*HNSEndpoint, error) { + operation := "Delete" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s", endpoint.Id) + + return HNSEndpointRequest("DELETE", endpoint.Id, "") +} + +// Delete Endpoint by sending EndpointRequest to HNS +func (endpoint *HNSEndpoint) Update() (*HNSEndpoint, error) { + operation := "Update" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s", endpoint.Id) + jsonString, err := json.Marshal(endpoint) + if err != nil { + return nil, err + } + err = hnsCall("POST", "/endpoints/"+endpoint.Id+"/update", string(jsonString), &endpoint) + + return endpoint, err +} + +// Hot Attach an endpoint to a container +func (endpoint *HNSEndpoint) HotAttach(containerID string) error { + operation := "HotAttach" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s, containerId=%s", endpoint.Id, containerID) + + return modifyNetworkEndpoint(containerID, endpoint.Id, Add) +} + +// Hot Detach an endpoint from a container +func (endpoint *HNSEndpoint) HotDetach(containerID string) error { + operation := "HotDetach" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s, containerId=%s", endpoint.Id, containerID) + + return modifyNetworkEndpoint(containerID, endpoint.Id, Remove) +} + +// Apply Acl Policy on the Endpoint +func (endpoint *HNSEndpoint) ApplyACLPolicy(policy *ACLPolicy) error { + operation := "ApplyACLPolicy" + title := "HCSShim::HNSEndpoint::" + operation + logrus.Debugf(title+" id=%s", endpoint.Id) + + jsonString, err := json.Marshal(policy) + if err != nil { + return err + } + endpoint.Policies[0] = jsonString + _, err = endpoint.Update() + return err +} diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hnsfuncs.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsfuncs.go index 97ec2e8e0f..2c1b979ae8 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/hnsfuncs.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsfuncs.go @@ -3,99 +3,10 @@ package hcsshim import ( "encoding/json" "fmt" - "net" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) -type NatPolicy struct { - Type string - Protocol string - InternalPort uint16 - ExternalPort uint16 -} - -type QosPolicy struct { - Type string - MaximumOutgoingBandwidthInBytes uint64 -} - -type VlanPolicy struct { - Type string - VLAN uint -} - -type VsidPolicy struct { - Type string - VSID uint -} - -type PaPolicy struct { - Type string - PA string -} - -// Subnet is assoicated with a network and represents a list -// of subnets available to the network -type Subnet struct { - AddressPrefix string `json:",omitempty"` - GatewayAddress string `json:",omitempty"` - Policies []json.RawMessage `json:",omitempty"` -} - -// MacPool is assoicated with a network and represents a list -// of macaddresses available to the network -type MacPool struct { - StartMacAddress string `json:",omitempty"` - EndMacAddress string `json:",omitempty"` -} - -// HNSNetwork represents a network in HNS -type HNSNetwork struct { - Id string `json:"ID,omitempty"` - Name string `json:",omitempty"` - Type string `json:",omitempty"` - NetworkAdapterName string `json:",omitempty"` - SourceMac string `json:",omitempty"` - Policies []json.RawMessage `json:",omitempty"` - MacPools []MacPool `json:",omitempty"` - Subnets []Subnet `json:",omitempty"` - DNSSuffix string `json:",omitempty"` - DNSServerList string `json:",omitempty"` - DNSServerCompartment uint32 `json:",omitempty"` - ManagementIP string `json:",omitempty"` -} - -// HNSEndpoint represents a network endpoint in HNS -type HNSEndpoint struct { - Id string `json:"ID,omitempty"` - Name string `json:",omitempty"` - VirtualNetwork string `json:",omitempty"` - VirtualNetworkName string `json:",omitempty"` - Policies []json.RawMessage `json:",omitempty"` - MacAddress string `json:",omitempty"` - IPAddress net.IP `json:",omitempty"` - DNSSuffix string `json:",omitempty"` - DNSServerList string `json:",omitempty"` - GatewayAddress string `json:",omitempty"` - EnableInternalDNS bool `json:",omitempty"` - DisableICC bool `json:",omitempty"` - PrefixLength uint8 `json:",omitempty"` - IsRemoteEndpoint bool `json:",omitempty"` -} - -type hnsNetworkResponse struct { - Success bool - Error string - Output HNSNetwork -} - -type hnsResponse struct { - Success bool - Error string - Output json.RawMessage -} - func hnsCall(method, path, request string, returnResponse interface{}) error { var responseBuffer *uint16 logrus.Debugf("[%s]=>[%s] Request : %s", method, path, request) @@ -127,145 +38,3 @@ func hnsCall(method, path, request string, returnResponse interface{}) error { return nil } - -// HNSNetworkRequest makes a call into HNS to update/query a single network -func HNSNetworkRequest(method, path, request string) (*HNSNetwork, error) { - var network HNSNetwork - err := hnsCall(method, "/networks/"+path, request, &network) - if err != nil { - return nil, err - } - - return &network, nil -} - -// HNSListNetworkRequest makes a HNS call to query the list of available networks -func HNSListNetworkRequest(method, path, request string) ([]HNSNetwork, error) { - var network []HNSNetwork - err := hnsCall(method, "/networks/"+path, request, &network) - if err != nil { - return nil, err - } - - return network, nil -} - -// HNSEndpointRequest makes a HNS call to modify/query a network endpoint -func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) { - endpoint := &HNSEndpoint{} - err := hnsCall(method, "/endpoints/"+path, request, &endpoint) - if err != nil { - return nil, err - } - - return endpoint, nil -} - -// HNSListEndpointRequest makes a HNS call to query the list of available endpoints -func HNSListEndpointRequest() ([]HNSEndpoint, error) { - var endpoint []HNSEndpoint - err := hnsCall("GET", "/endpoints/", "", &endpoint) - if err != nil { - return nil, err - } - - return endpoint, nil -} - -// HotAttachEndpoint makes a HCS Call to attach the endpoint to the container -func HotAttachEndpoint(containerID string, endpointID string) error { - return modifyNetworkEndpoint(containerID, endpointID, Add) -} - -// HotDetachEndpoint makes a HCS Call to detach the endpoint from the container -func HotDetachEndpoint(containerID string, endpointID string) error { - return modifyNetworkEndpoint(containerID, endpointID, Remove) -} - -// ModifyContainer corresponding to the container id, by sending a request -func modifyContainer(id string, request *ResourceModificationRequestResponse) error { - container, err := OpenContainer(id) - if err != nil { - if IsNotExist(err) { - return ErrComputeSystemDoesNotExist - } - return getInnerError(err) - } - defer container.Close() - err = container.Modify(request) - if err != nil { - if IsNotSupported(err) { - return ErrPlatformNotSupported - } - return getInnerError(err) - } - - return nil -} - -func modifyNetworkEndpoint(containerID string, endpointID string, request RequestType) error { - requestMessage := &ResourceModificationRequestResponse{ - Resource: Network, - Request: request, - Data: endpointID, - } - err := modifyContainer(containerID, requestMessage) - - if err != nil { - return err - } - - return nil -} - -// GetHNSNetworkByID -func GetHNSNetworkByID(networkID string) (*HNSNetwork, error) { - return HNSNetworkRequest("GET", networkID, "") -} - -// GetHNSNetworkName filtered by Name -func GetHNSNetworkByName(networkName string) (*HNSNetwork, error) { - hsnnetworks, err := HNSListNetworkRequest("GET", "", "") - if err != nil { - return nil, err - } - for _, hnsnetwork := range hsnnetworks { - if hnsnetwork.Name == networkName { - return &hnsnetwork, nil - } - } - return nil, fmt.Errorf("Network %v not found", networkName) -} - -// Create Endpoint by sending EndpointRequest to HNS. TODO: Create a separate HNS interface to place all these methods -func (endpoint *HNSEndpoint) Create() (*HNSEndpoint, error) { - jsonString, err := json.Marshal(endpoint) - if err != nil { - return nil, err - } - return HNSEndpointRequest("POST", "", string(jsonString)) -} - -// Create Endpoint by sending EndpointRequest to HNS -func (endpoint *HNSEndpoint) Delete() (*HNSEndpoint, error) { - return HNSEndpointRequest("DELETE", endpoint.Id, "") -} - -// GetHNSEndpointByID -func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) { - return HNSEndpointRequest("GET", endpointID, "") -} - -// GetHNSNetworkName filtered by Name -func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) { - hnsResponse, err := HNSListEndpointRequest() - if err != nil { - return nil, err - } - for _, hnsEndpoint := range hnsResponse { - if hnsEndpoint.Name == endpointName { - return &hnsEndpoint, nil - } - } - return nil, fmt.Errorf("Endpoint %v not found", endpointName) -} diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hnsnetwork.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsnetwork.go new file mode 100644 index 0000000000..3345bfa3f2 --- /dev/null +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hnsnetwork.go @@ -0,0 +1,142 @@ +package hcsshim + +import ( + "encoding/json" + "fmt" + "net" + + "github.com/sirupsen/logrus" +) + +// Subnet is assoicated with a network and represents a list +// of subnets available to the network +type Subnet struct { + AddressPrefix string `json:",omitempty"` + GatewayAddress string `json:",omitempty"` + Policies []json.RawMessage `json:",omitempty"` +} + +// MacPool is assoicated with a network and represents a list +// of macaddresses available to the network +type MacPool struct { + StartMacAddress string `json:",omitempty"` + EndMacAddress string `json:",omitempty"` +} + +// HNSNetwork represents a network in HNS +type HNSNetwork struct { + Id string `json:"ID,omitempty"` + Name string `json:",omitempty"` + Type string `json:",omitempty"` + NetworkAdapterName string `json:",omitempty"` + SourceMac string `json:",omitempty"` + Policies []json.RawMessage `json:",omitempty"` + MacPools []MacPool `json:",omitempty"` + Subnets []Subnet `json:",omitempty"` + DNSSuffix string `json:",omitempty"` + DNSServerList string `json:",omitempty"` + DNSServerCompartment uint32 `json:",omitempty"` + ManagementIP string `json:",omitempty"` + AutomaticDNS bool `json:",omitempty"` +} + +type hnsNetworkResponse struct { + Success bool + Error string + Output HNSNetwork +} + +type hnsResponse struct { + Success bool + Error string + Output json.RawMessage +} + +// HNSNetworkRequest makes a call into HNS to update/query a single network +func HNSNetworkRequest(method, path, request string) (*HNSNetwork, error) { + var network HNSNetwork + err := hnsCall(method, "/networks/"+path, request, &network) + if err != nil { + return nil, err + } + + return &network, nil +} + +// HNSListNetworkRequest makes a HNS call to query the list of available networks +func HNSListNetworkRequest(method, path, request string) ([]HNSNetwork, error) { + var network []HNSNetwork + err := hnsCall(method, "/networks/"+path, request, &network) + if err != nil { + return nil, err + } + + return network, nil +} + +// GetHNSNetworkByID +func GetHNSNetworkByID(networkID string) (*HNSNetwork, error) { + return HNSNetworkRequest("GET", networkID, "") +} + +// GetHNSNetworkName filtered by Name +func GetHNSNetworkByName(networkName string) (*HNSNetwork, error) { + hsnnetworks, err := HNSListNetworkRequest("GET", "", "") + if err != nil { + return nil, err + } + for _, hnsnetwork := range hsnnetworks { + if hnsnetwork.Name == networkName { + return &hnsnetwork, nil + } + } + return nil, fmt.Errorf("Network %v not found", networkName) +} + +// Create Network by sending NetworkRequest to HNS. +func (network *HNSNetwork) Create() (*HNSNetwork, error) { + operation := "Create" + title := "HCSShim::HNSNetwork::" + operation + logrus.Debugf(title+" id=%s", network.Id) + + jsonString, err := json.Marshal(network) + if err != nil { + return nil, err + } + return HNSNetworkRequest("POST", "", string(jsonString)) +} + +// Delete Network by sending NetworkRequest to HNS +func (network *HNSNetwork) Delete() (*HNSNetwork, error) { + operation := "Delete" + title := "HCSShim::HNSNetwork::" + operation + logrus.Debugf(title+" id=%s", network.Id) + + return HNSNetworkRequest("DELETE", network.Id, "") +} + +// Creates an endpoint on the Network. +func (network *HNSNetwork) NewEndpoint(ipAddress net.IP, macAddress net.HardwareAddr) *HNSEndpoint { + return &HNSEndpoint{ + VirtualNetwork: network.Id, + IPAddress: ipAddress, + MacAddress: string(macAddress), + } +} + +func (network *HNSNetwork) CreateEndpoint(endpoint *HNSEndpoint) (*HNSEndpoint, error) { + operation := "CreateEndpoint" + title := "HCSShim::HNSNetwork::" + operation + logrus.Debugf(title+" id=%s, endpointId=%s", network.Id, endpoint.Id) + + endpoint.VirtualNetwork = network.Id + return endpoint.Create() +} + +func (network *HNSNetwork) CreateRemoteEndpoint(endpoint *HNSEndpoint) (*HNSEndpoint, error) { + operation := "CreateRemoteEndpoint" + title := "HCSShim::HNSNetwork::" + operation + logrus.Debugf(title+" id=%s", network.Id) + endpoint.IsRemoteEndpoint = true + return network.CreateEndpoint(endpoint) +} diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicy.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicy.go new file mode 100644 index 0000000000..ecfbf0eda3 --- /dev/null +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicy.go @@ -0,0 +1,95 @@ +package hcsshim + +// Type of Request Support in ModifySystem +type PolicyType string + +// RequestType const +const ( + Nat PolicyType = "NAT" + ACL PolicyType = "ACL" + PA PolicyType = "PA" + VLAN PolicyType = "VLAN" + VSID PolicyType = "VSID" + VNet PolicyType = "VNET" + L2Driver PolicyType = "L2Driver" + Isolation PolicyType = "Isolation" + QOS PolicyType = "QOS" + OutboundNat PolicyType = "OutBoundNAT" + ExternalLoadBalancer PolicyType = "ELB" + Route PolicyType = "ROUTE" +) + +type NatPolicy struct { + Type PolicyType `json:"Type"` + Protocol string + InternalPort uint16 + ExternalPort uint16 +} + +type QosPolicy struct { + Type PolicyType `json:"Type"` + MaximumOutgoingBandwidthInBytes uint64 +} + +type IsolationPolicy struct { + Type PolicyType `json:"Type"` + VLAN uint + VSID uint + InDefaultIsolation bool +} + +type VlanPolicy struct { + Type PolicyType `json:"Type"` + VLAN uint +} + +type VsidPolicy struct { + Type PolicyType `json:"Type"` + VSID uint +} + +type PaPolicy struct { + Type PolicyType `json:"Type"` + PA string `json:"PA"` +} + +type OutboundNatPolicy struct { + Policy + VIP string `json:"VIP,omitempty"` + Exceptions []string `json:"ExceptionList,omitempty"` +} + +type ActionType string +type DirectionType string +type RuleType string + +const ( + Allow ActionType = "Allow" + Block ActionType = "Block" + + In DirectionType = "In" + Out DirectionType = "Out" + + Host RuleType = "Host" + Switch RuleType = "Switch" +) + +type ACLPolicy struct { + Type PolicyType `json:"Type"` + Protocol uint16 + InternalPort uint16 + Action ActionType + Direction DirectionType + LocalAddress string + RemoteAddress string + LocalPort uint16 + RemotePort uint16 + RuleType RuleType `json:"RuleType,omitempty"` + + Priority uint16 + ServiceName string +} + +type Policy struct { + Type PolicyType `json:"Type"` +} diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicylist.go b/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicylist.go new file mode 100644 index 0000000000..4f2978f680 --- /dev/null +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/hnspolicylist.go @@ -0,0 +1,187 @@ +package hcsshim + +import ( + "encoding/json" + + "github.com/sirupsen/logrus" +) + +type RoutePolicy struct { + Policy + DestinationPrefix string `json:"DestinationPrefix,omitempty"` + NextHop string `json:"NextHop,omitempty"` + EncapEnabled bool `json:"NeedEncap,omitempty"` +} + +type ELBPolicy struct { + LBPolicy + SourceVIP string `json:"SourceVIP,omitempty"` + VIPs []string `json:"VIPs,omitempty"` + ILB bool `json:"ILB,omitempty"` +} + +type LBPolicy struct { + Policy + Protocol uint16 `json:"Protocol,omitempty"` + InternalPort uint16 + ExternalPort uint16 +} + +type PolicyList struct { + Id string `json:"ID,omitempty"` + EndpointReferences []string `json:"References,omitempty"` + Policies []string `json:"Policies,omitempty"` +} + +// HNSPolicyListRequest makes a call into HNS to update/query a single network +func HNSPolicyListRequest(method, path, request string) (*PolicyList, error) { + var policy PolicyList + err := hnsCall(method, "/policylists/"+path, request, &policy) + if err != nil { + return nil, err + } + + return &policy, nil +} + +func HNSListPolicyListRequest() ([]PolicyList, error) { + var plist []PolicyList + err := hnsCall("GET", "/policylists/", "", &plist) + if err != nil { + return nil, err + } + + return plist, nil +} + +// PolicyListRequest makes a HNS call to modify/query a network endpoint +func PolicyListRequest(method, path, request string) (*PolicyList, error) { + policylist := &PolicyList{} + err := hnsCall(method, "/policylists/"+path, request, &policylist) + if err != nil { + return nil, err + } + + return policylist, nil +} + +// Create PolicyList by sending PolicyListRequest to HNS. +func (policylist *PolicyList) Create() (*PolicyList, error) { + operation := "Create" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" id=%s", policylist.Id) + jsonString, err := json.Marshal(policylist) + if err != nil { + return nil, err + } + return PolicyListRequest("POST", "", string(jsonString)) +} + +// Create PolicyList by sending PolicyListRequest to HNS +func (policylist *PolicyList) Delete() (*PolicyList, error) { + operation := "Delete" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" id=%s", policylist.Id) + + return PolicyListRequest("DELETE", policylist.Id, "") +} + +// Add an endpoint to a Policy List +func (policylist *PolicyList) AddEndpoint(endpoint *HNSEndpoint) (*PolicyList, error) { + operation := "AddEndpoint" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" id=%s, endpointId:%s", policylist.Id, endpoint.Id) + + _, err := policylist.Delete() + if err != nil { + return nil, err + } + + // Add Endpoint to the Existing List + policylist.EndpointReferences = append(policylist.EndpointReferences, "/endpoints/"+endpoint.Id) + + return policylist.Create() +} + +// Remove an endpoint from the Policy List +func (policylist *PolicyList) RemoveEndpoint(endpoint *HNSEndpoint) (*PolicyList, error) { + operation := "RemoveEndpoint" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" id=%s, endpointId:%s", policylist.Id, endpoint.Id) + + _, err := policylist.Delete() + if err != nil { + return nil, err + } + + elementToRemove := "/endpoints/" + endpoint.Id + + var references []string + + for _, endpointReference := range policylist.EndpointReferences { + if endpointReference == elementToRemove { + continue + } + references = append(references, endpointReference) + } + policylist.EndpointReferences = references + return policylist.Create() +} + +// AddLoadBalancer policy list for the specified endpoints +func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) { + operation := "AddLoadBalancer" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" Vip:%s", vip) + + policylist := &PolicyList{} + + elbPolicy := &ELBPolicy{ + VIPs: []string{vip}, + ILB: isILB, + } + elbPolicy.Type = ExternalLoadBalancer + elbPolicy.Protocol = protocol + elbPolicy.InternalPort = internalPort + elbPolicy.ExternalPort = externalPort + + for _, endpoint := range endpoints { + policylist.EndpointReferences = append(policylist.EndpointReferences, "/endpoints/"+endpoint.Id) + } + + jsonString, err := json.Marshal(elbPolicy) + if err != nil { + return nil, err + } + + policylist.Policies[0] = string(jsonString) + return policylist.Create() +} + +// AddLoadBalancer policy list for the specified endpoints +func AddRoute(endpoints []HNSEndpoint, destinationPrefix string, nextHop string, encapEnabled bool) (*PolicyList, error) { + operation := "AddRoute" + title := "HCSShim::PolicyList::" + operation + logrus.Debugf(title+" destinationPrefix:%s", destinationPrefix) + + policylist := &PolicyList{} + + rPolicy := &RoutePolicy{ + DestinationPrefix: destinationPrefix, + NextHop: nextHop, + EncapEnabled: encapEnabled, + } + rPolicy.Type = Route + + for _, endpoint := range endpoints { + policylist.EndpointReferences = append(policylist.EndpointReferences, "/endpoints/"+endpoint.Id) + } + + jsonString, err := json.Marshal(rPolicy) + if err != nil { + return nil, err + } + + policylist.Policies[0] = string(jsonString) + return policylist.Create() +} diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/importlayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/importlayer.go index 75dcd94777..3aed14376a 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/importlayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/importlayer.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/Microsoft/go-winio" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // ImportLayer will take the contents of the folder at importFolderPath and import diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/interface.go b/components/engine/vendor/github.com/Microsoft/hcsshim/interface.go index 5238a641ea..a547dd3136 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/interface.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/interface.go @@ -37,11 +37,17 @@ type MappedDir struct { IOPSMaximum uint64 } +type MappedPipe struct { + HostPath string + ContainerPipeName string +} + type HvRuntime struct { - ImagePath string `json:",omitempty"` - SkipTemplate bool `json:",omitempty"` - LinuxInitrdFile string `json:",omitempty"` // File under ImagePath on host containing an initrd image for starting a Linux utility VM - LinuxKernelFile string `json:",omitempty"` // File under ImagePath on host containing a kernel for starting a Linux utility VM + ImagePath string `json:",omitempty"` + SkipTemplate bool `json:",omitempty"` + LinuxInitrdFile string `json:",omitempty"` // File under ImagePath on host containing an initrd image for starting a Linux utility VM + LinuxKernelFile string `json:",omitempty"` // File under ImagePath on host containing a kernel for starting a Linux utility VM + LinuxBootParameters string `json:",omitempty"` // Additional boot parameters for starting a Linux Utility VM in initrd mode } type MappedVirtualDisk struct { @@ -50,6 +56,7 @@ type MappedVirtualDisk struct { CreateInUtilityVM bool `json:",omitempty"` ReadOnly bool `json:",omitempty"` Cache string `json:",omitempty"` // "" (Unspecified); "Disabled"; "Enabled"; "Private"; "PrivateAllowSharing" + AttachOnly bool `json:",omitempty:` } // ContainerConfig is used as both the input of CreateContainer @@ -64,14 +71,15 @@ type ContainerConfig struct { Layers []Layer // List of storage layers. Required for Windows Server and Hyper-V Containers. Format ID=GUID;Path=%root%\windowsfilter\layerID Credentials string `json:",omitempty"` // Credentials information ProcessorCount uint32 `json:",omitempty"` // Number of processors to assign to the container. - ProcessorWeight uint64 `json:",omitempty"` // CPU Shares 0..10000 on Windows; where 0 will be omitted and HCS will default. - ProcessorMaximum int64 `json:",omitempty"` // CPU maximum usage percent 1..100 + ProcessorWeight uint64 `json:",omitempty"` // CPU shares (relative weight to other containers with cpu shares). Range is from 1 to 10000. A value of 0 results in default shares. + ProcessorMaximum int64 `json:",omitempty"` // Specifies the portion of processor cycles that this container can use as a percentage times 100. Range is from 1 to 10000. A value of 0 results in no limit. StorageIOPSMaximum uint64 `json:",omitempty"` // Maximum Storage IOPS StorageBandwidthMaximum uint64 `json:",omitempty"` // Maximum Storage Bandwidth in bytes per second StorageSandboxSize uint64 `json:",omitempty"` // Size in bytes that the container system drive should be expanded to if smaller MemoryMaximumInMB int64 `json:",omitempty"` // Maximum memory available to the container in Megabytes HostName string `json:",omitempty"` // Hostname MappedDirectories []MappedDir `json:",omitempty"` // List of mapped directories (volumes/mounts) + MappedPipes []MappedPipe `json:",omitempty"` // List of mapped Windows named pipes HvPartition bool // True if it a Hyper-V Container NetworkSharedContainerName string `json:",omitempty"` // Name (ID) of the container that we will share the network stack with. EndpointList []string `json:",omitempty"` // List of networking endpoints to be attached to container @@ -124,6 +132,9 @@ type Container interface { // ProcessList returns details for the processes in a container. ProcessList() ([]ProcessListItem, error) + // MappedVirtualDisks returns virtual disks mapped to a utility VM, indexed by controller + MappedVirtualDisks() (map[int]MappedVirtualDiskController, error) + // CreateProcess launches a new process within the container. CreateProcess(c *ProcessConfig) (Process, error) diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/layerexists.go b/components/engine/vendor/github.com/Microsoft/hcsshim/layerexists.go index 522d95cce4..fe46f404c3 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/layerexists.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/layerexists.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // LayerExists will return true if a layer with the given id exists and is known // to the system. diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/layerutils.go b/components/engine/vendor/github.com/Microsoft/hcsshim/layerutils.go index 47229d22e5..c0e5503773 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/layerutils.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/layerutils.go @@ -7,7 +7,7 @@ import ( "path/filepath" "syscall" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) /* To pass into syscall, we need a struct matching the following: diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/nametoguid.go b/components/engine/vendor/github.com/Microsoft/hcsshim/nametoguid.go index 1a522f95e0..b7c6d020c6 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/nametoguid.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/nametoguid.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // NameToGuid converts the given string into a GUID using the algorithm in the // Host Compute Service, ensuring GUIDs generated with the same string are common diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/preparelayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/preparelayer.go index 2791683467..5c5b618411 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/preparelayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/preparelayer.go @@ -3,7 +3,7 @@ package hcsshim import ( "sync" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var prepareLayerLock sync.Mutex diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/process.go b/components/engine/vendor/github.com/Microsoft/hcsshim/process.go index 4ef0ed3e52..faee2cfeeb 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/process.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/process.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // ContainerError is an error encountered in HCS diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/unpreparelayer.go b/components/engine/vendor/github.com/Microsoft/hcsshim/unpreparelayer.go index d0ead0bdda..e8a3b507bf 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/unpreparelayer.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/unpreparelayer.go @@ -1,6 +1,6 @@ package hcsshim -import "github.com/Sirupsen/logrus" +import "github.com/sirupsen/logrus" // UnprepareLayer disables the filesystem filter for the read-write layer with // the given id. diff --git a/components/engine/vendor/github.com/Microsoft/hcsshim/waithelper.go b/components/engine/vendor/github.com/Microsoft/hcsshim/waithelper.go index 828d148e58..b7be20ea0c 100644 --- a/components/engine/vendor/github.com/Microsoft/hcsshim/waithelper.go +++ b/components/engine/vendor/github.com/Microsoft/hcsshim/waithelper.go @@ -3,7 +3,7 @@ package hcsshim import ( "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) func processAsyncHcsResult(err error, resultp *uint16, callbackNumber uintptr, expectedNotification hcsNotification, timeout *time.Duration) error { diff --git a/components/engine/vendor/github.com/containerd/containerd/runtime/container.go b/components/engine/vendor/github.com/containerd/containerd/runtime/container.go index 43351cab17..fe5fb3b28a 100644 --- a/components/engine/vendor/github.com/containerd/containerd/runtime/container.go +++ b/components/engine/vendor/github.com/containerd/containerd/runtime/container.go @@ -12,9 +12,9 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" "github.com/containerd/containerd/specs" ocs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "golang.org/x/sys/unix" ) diff --git a/components/engine/vendor/github.com/containerd/containerd/runtime/process.go b/components/engine/vendor/github.com/containerd/containerd/runtime/process.go index 22d0192780..ea6ec0c37a 100644 --- a/components/engine/vendor/github.com/containerd/containerd/runtime/process.go +++ b/components/engine/vendor/github.com/containerd/containerd/runtime/process.go @@ -14,9 +14,9 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" "github.com/containerd/containerd/osutils" "github.com/containerd/containerd/specs" + "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/components/engine/vendor/github.com/docker/distribution/README.md b/components/engine/vendor/github.com/docker/distribution/README.md index a6e8db0fb7..998878850c 100644 --- a/components/engine/vendor/github.com/docker/distribution/README.md +++ b/components/engine/vendor/github.com/docker/distribution/README.md @@ -76,8 +76,7 @@ may be the better choice. For those who have previously deployed their own registry based on the Registry 1.0 implementation and wish to deploy a Registry 2.0 while retaining images, data migration is required. A tool to assist with migration efforts has been -created. For more information see [docker/migrator] -(https://github.com/docker/migrator). +created. For more information see [docker/migrator](https://github.com/docker/migrator). ## Contribute diff --git a/components/engine/vendor/github.com/docker/distribution/blobs.go b/components/engine/vendor/github.com/docker/distribution/blobs.go index 79c5fb33be..01d309029f 100644 --- a/components/engine/vendor/github.com/docker/distribution/blobs.go +++ b/components/engine/vendor/github.com/docker/distribution/blobs.go @@ -152,7 +152,7 @@ type BlobProvider interface { // BlobServer can serve blobs via http. type BlobServer interface { - // ServeBlob attempts to serve the blob, identifed by dgst, via http. The + // ServeBlob attempts to serve the blob, identified by dgst, via http. The // service may decide to redirect the client elsewhere or serve the data // directly. // diff --git a/components/engine/vendor/github.com/docker/distribution/context/doc.go b/components/engine/vendor/github.com/docker/distribution/context/doc.go index 3b4ab8882f..9b623074eb 100644 --- a/components/engine/vendor/github.com/docker/distribution/context/doc.go +++ b/components/engine/vendor/github.com/docker/distribution/context/doc.go @@ -64,7 +64,7 @@ // Note that this only affects the new context, the previous context, with the // version field, can be used independently. Put another way, the new logger, // added to the request context, is unique to that context and can have -// request scoped varaibles. +// request scoped variables. // // HTTP Requests // diff --git a/components/engine/vendor/github.com/docker/distribution/context/http.go b/components/engine/vendor/github.com/docker/distribution/context/http.go index 7fe9b8ab05..7d65c8524e 100644 --- a/components/engine/vendor/github.com/docker/distribution/context/http.go +++ b/components/engine/vendor/github.com/docker/distribution/context/http.go @@ -8,9 +8,9 @@ import ( "sync" "time" - log "github.com/Sirupsen/logrus" "github.com/docker/distribution/uuid" "github.com/gorilla/mux" + log "github.com/sirupsen/logrus" ) // Common errors used with this package. diff --git a/components/engine/vendor/github.com/docker/distribution/context/logger.go b/components/engine/vendor/github.com/docker/distribution/context/logger.go index fbb6a0511f..86c5964e49 100644 --- a/components/engine/vendor/github.com/docker/distribution/context/logger.go +++ b/components/engine/vendor/github.com/docker/distribution/context/logger.go @@ -3,7 +3,7 @@ package context import ( "fmt" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "runtime" ) diff --git a/components/engine/vendor/github.com/docker/distribution/errors.go b/components/engine/vendor/github.com/docker/distribution/errors.go index 2062a06fbd..020d33258b 100644 --- a/components/engine/vendor/github.com/docker/distribution/errors.go +++ b/components/engine/vendor/github.com/docker/distribution/errors.go @@ -77,7 +77,7 @@ func (err ErrManifestUnknownRevision) Error() string { type ErrManifestUnverified struct{} func (ErrManifestUnverified) Error() string { - return fmt.Sprintf("unverified manifest") + return "unverified manifest" } // ErrManifestVerification provides a type to collect errors encountered diff --git a/components/engine/vendor/github.com/docker/distribution/manifest/manifestlist/manifestlist.go b/components/engine/vendor/github.com/docker/distribution/manifest/manifestlist/manifestlist.go index 7a8cabbdba..3aa0662d9f 100644 --- a/components/engine/vendor/github.com/docker/distribution/manifest/manifestlist/manifestlist.go +++ b/components/engine/vendor/github.com/docker/distribution/manifest/manifestlist/manifestlist.go @@ -81,7 +81,7 @@ type ManifestList struct { Manifests []ManifestDescriptor `json:"manifests"` } -// References returnes the distribution descriptors for the referenced image +// References returns the distribution descriptors for the referenced image // manifests. func (m ManifestList) References() []distribution.Descriptor { dependencies := make([]distribution.Descriptor, len(m.Manifests)) diff --git a/components/engine/vendor/github.com/docker/distribution/manifest/schema1/verify.go b/components/engine/vendor/github.com/docker/distribution/manifest/schema1/verify.go index fa8daa56f5..ef59065cd6 100644 --- a/components/engine/vendor/github.com/docker/distribution/manifest/schema1/verify.go +++ b/components/engine/vendor/github.com/docker/distribution/manifest/schema1/verify.go @@ -3,8 +3,8 @@ package schema1 import ( "crypto/x509" - "github.com/Sirupsen/logrus" "github.com/docker/libtrust" + "github.com/sirupsen/logrus" ) // Verify verifies the signature of the signed manifest returning the public diff --git a/components/engine/vendor/github.com/docker/distribution/reference/reference.go b/components/engine/vendor/github.com/docker/distribution/reference/reference.go index fd3510e9ee..2f66cca87a 100644 --- a/components/engine/vendor/github.com/docker/distribution/reference/reference.go +++ b/components/engine/vendor/github.com/docker/distribution/reference/reference.go @@ -15,7 +15,7 @@ // tag := /[\w][\w.-]{0,127}/ // // digest := digest-algorithm ":" digest-hex -// digest-algorithm := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ] +// digest-algorithm := digest-algorithm-component [ digest-algorithm-separator digest-algorithm-component ]* // digest-algorithm-separator := /[+.-_]/ // digest-algorithm-component := /[A-Za-z][A-Za-z0-9]*/ // digest-hex := /[0-9a-fA-F]{32,}/ ; At least 128 bit digest value diff --git a/components/engine/vendor/github.com/docker/distribution/registry/api/v2/urls.go b/components/engine/vendor/github.com/docker/distribution/registry/api/v2/urls.go index e2e242eab0..1337bdb127 100644 --- a/components/engine/vendor/github.com/docker/distribution/registry/api/v2/urls.go +++ b/components/engine/vendor/github.com/docker/distribution/registry/api/v2/urls.go @@ -1,10 +1,9 @@ package v2 import ( - "net" + "fmt" "net/http" "net/url" - "strconv" "strings" "github.com/docker/distribution/reference" @@ -48,66 +47,42 @@ func NewURLBuilderFromString(root string, relative bool) (*URLBuilder, error) { // NewURLBuilderFromRequest uses information from an *http.Request to // construct the root url. func NewURLBuilderFromRequest(r *http.Request, relative bool) *URLBuilder { - var scheme string - - forwardedProto := r.Header.Get("X-Forwarded-Proto") - // TODO: log the error - forwardedHeader, _, _ := parseForwardedHeader(r.Header.Get("Forwarded")) - - switch { - case len(forwardedProto) > 0: - scheme = forwardedProto - case len(forwardedHeader["proto"]) > 0: - scheme = forwardedHeader["proto"] - case r.TLS != nil: - scheme = "https" - case len(r.URL.Scheme) > 0: - scheme = r.URL.Scheme - default: + var ( scheme = "http" + host = r.Host + ) + + if r.TLS != nil { + scheme = "https" + } else if len(r.URL.Scheme) > 0 { + scheme = r.URL.Scheme } - host := r.Host - - if forwardedHost := r.Header.Get("X-Forwarded-Host"); len(forwardedHost) > 0 { - // According to the Apache mod_proxy docs, X-Forwarded-Host can be a - // comma-separated list of hosts, to which each proxy appends the - // requested host. We want to grab the first from this comma-separated - // list. - hosts := strings.SplitN(forwardedHost, ",", 2) - host = strings.TrimSpace(hosts[0]) - } else if addr, exists := forwardedHeader["for"]; exists { - host = addr - } else if h, exists := forwardedHeader["host"]; exists { - host = h - } - - portLessHost, port := host, "" - if !isIPv6Address(portLessHost) { - // with go 1.6, this would treat the last part of IPv6 address as a port - portLessHost, port, _ = net.SplitHostPort(host) - } - if forwardedPort := r.Header.Get("X-Forwarded-Port"); len(port) == 0 && len(forwardedPort) > 0 { - ports := strings.SplitN(forwardedPort, ",", 2) - forwardedPort = strings.TrimSpace(ports[0]) - if _, err := strconv.ParseInt(forwardedPort, 10, 32); err == nil { - port = forwardedPort + // Handle fowarded headers + // Prefer "Forwarded" header as defined by rfc7239 if given + // see https://tools.ietf.org/html/rfc7239 + if forwarded := r.Header.Get("Forwarded"); len(forwarded) > 0 { + forwardedHeader, _, err := parseForwardedHeader(forwarded) + if err == nil { + if fproto := forwardedHeader["proto"]; len(fproto) > 0 { + scheme = fproto + } + if fhost := forwardedHeader["host"]; len(fhost) > 0 { + host = fhost + } } - } - - if len(portLessHost) > 0 { - host = portLessHost - } - if len(port) > 0 { - // remove enclosing brackets of ipv6 address otherwise they will be duplicated - if len(host) > 1 && host[0] == '[' && host[len(host)-1] == ']' { - host = host[1 : len(host)-1] + } else { + if forwardedProto := r.Header.Get("X-Forwarded-Proto"); len(forwardedProto) > 0 { + scheme = forwardedProto + } + if forwardedHost := r.Header.Get("X-Forwarded-Host"); len(forwardedHost) > 0 { + // According to the Apache mod_proxy docs, X-Forwarded-Host can be a + // comma-separated list of hosts, to which each proxy appends the + // requested host. We want to grab the first from this comma-separated + // list. + hosts := strings.SplitN(forwardedHost, ",", 2) + host = strings.TrimSpace(hosts[0]) } - // JoinHostPort properly encloses ipv6 addresses in square brackets - host = net.JoinHostPort(host, port) - } else if isIPv6Address(host) && host[0] != '[' { - // ipv6 needs to be enclosed in square brackets in urls - host = "[" + host + "]" } basePath := routeDescriptorsMap[RouteNameBase].Path @@ -175,6 +150,8 @@ func (ub *URLBuilder) BuildManifestURL(ref reference.Named) (string, error) { tagOrDigest = v.Tag() case reference.Digested: tagOrDigest = v.Digest().String() + default: + return "", fmt.Errorf("reference must have a tag or digest") } manifestURL, err := route.URL("name", ref.Name(), "reference", tagOrDigest) @@ -287,28 +264,3 @@ func appendValues(u string, values ...url.Values) string { return appendValuesURL(up, values...).String() } - -// isIPv6Address returns true if given string is a valid IPv6 address. No port is allowed. The address may be -// enclosed in square brackets. -func isIPv6Address(host string) bool { - if len(host) > 1 && host[0] == '[' && host[len(host)-1] == ']' { - host = host[1 : len(host)-1] - } - // The IPv6 scoped addressing zone identifier starts after the last percent sign. - if i := strings.LastIndexByte(host, '%'); i > 0 { - host = host[:i] - } - ip := net.ParseIP(host) - if ip == nil { - return false - } - if ip.To16() == nil { - return false - } - if ip.To4() == nil { - return true - } - // dot can be present in ipv4-mapped address, it needs to come after a colon though - i := strings.IndexAny(host, ":.") - return i >= 0 && host[i] == ':' -} diff --git a/components/engine/vendor/github.com/docker/distribution/registry/client/auth/session.go b/components/engine/vendor/github.com/docker/distribution/registry/client/auth/session.go index 3ca5e8b3e7..be474d825f 100644 --- a/components/engine/vendor/github.com/docker/distribution/registry/client/auth/session.go +++ b/components/engine/vendor/github.com/docker/distribution/registry/client/auth/session.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/docker/distribution/registry/client" "github.com/docker/distribution/registry/client/auth/challenge" "github.com/docker/distribution/registry/client/transport" + "github.com/sirupsen/logrus" ) var ( diff --git a/components/engine/vendor/github.com/docker/distribution/vendor.conf b/components/engine/vendor/github.com/docker/distribution/vendor.conf index 443b4bcfe4..d67edd779e 100644 --- a/components/engine/vendor/github.com/docker/distribution/vendor.conf +++ b/components/engine/vendor/github.com/docker/distribution/vendor.conf @@ -1,19 +1,21 @@ -github.com/Azure/azure-sdk-for-go c6f0533defaaaa26ea4dff3c9774e36033088112 -github.com/Sirupsen/logrus d26492970760ca5d33129d2d799e34be5c4782eb +github.com/Azure/azure-sdk-for-go 088007b3b08cc02b27f2eadfdcd870958460ce7e +github.com/Azure/go-autorest ec5f4903f77ed9927ac95b19ab8e44ada64c1356 +github.com/sirupsen/logrus 3d4380f53a34dcdc95f0c1db702615992b38d9a4 github.com/aws/aws-sdk-go c6fc52983ea2375810aa38ddb5370e9cdf611716 -github.com/bshuster-repo/logrus-logstash-hook 5f729f2fb50a301153cae84ff5c58981d51c095a +github.com/bshuster-repo/logrus-logstash-hook d2c0ecc1836d91814e15e23bb5dc309c3ef51f4a github.com/bugsnag/bugsnag-go b1d153021fcd90ca3f080db36bec96dc690fb274 github.com/bugsnag/osext 0dd3f918b21bec95ace9dc86c7e70266cfc5c702 github.com/bugsnag/panicwrap e2c28503fcd0675329da73bf48b33404db873782 github.com/denverdino/aliyungo afedced274aa9a7fcdd47ac97018f0f8db4e5de2 +github.com/dgrijalva/jwt-go a601269ab70c205d26370c16f7c81e9017c14e04 github.com/docker/goamz f0a21f5b2e12f83a505ecf79b633bb2035cf6f85 github.com/docker/libtrust fa567046d9b14f6aa788882a950d69651d230b21 github.com/garyburd/redigo 535138d7bcd717d6531c701ef5933d98b1866257 github.com/go-ini/ini 2ba15ac2dc9cdf88c110ec2dc0ced7fa45f5678c -github.com/golang/protobuf/proto 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 +github.com/golang/protobuf 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3 github.com/gorilla/context 14f550f51af52180c2eefed15e5fd18d63c0a64a github.com/gorilla/handlers 60c7bfde3e33c201519a200a4507a158cc03a17b -github.com/gorilla/mux e444e69cbd2e2e3e0749a2f3c717cec491552bbf +github.com/gorilla/mux 599cba5e7b6137d46ddf58fb1765f5d928e69604 github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d github.com/miekg/dns 271c58e0c14f552178ea321a545ff9af38930f39 @@ -21,15 +23,15 @@ github.com/mitchellh/mapstructure 482a9fd5fa83e8c4e7817413b80f3eb8feec03ef github.com/ncw/swift b964f2ca856aac39885e258ad25aec08d5f64ee6 github.com/spf13/cobra 312092086bed4968099259622145a0c9ae280064 github.com/spf13/pflag 5644820622454e71517561946e3d94b9f9db6842 -github.com/stevvooe/resumable 51ad44105773cafcbe91927f70ac68e1bf78f8b4 -github.com/xenolf/lego/acme a9d8cec0e6563575e5868a005359ac97911b5985 +github.com/stevvooe/resumable 2aaf90b2ceea5072cb503ef2a620b08ff3119870 +github.com/xenolf/lego a9d8cec0e6563575e5868a005359ac97911b5985 github.com/yvasiyarov/go-metrics 57bccd1ccd43f94bb17fdd8bf3007059b802f85e github.com/yvasiyarov/gorelic a9bba5b9ab508a086f9a12b8c51fab68478e2128 github.com/yvasiyarov/newrelic_platform_go b21fdbd4370f3717f3bbd2bf41c223bc273068e6 golang.org/x/crypto c10c31b5e94b6f7a0283272dc2bb27163dcea24b golang.org/x/net 4876518f9e71663000c348837735820161a42df7 golang.org/x/oauth2 045497edb6234273d67dbc25da3f2ddbc4c4cacf -golang.org/x/time/rate a4bde12657593d5e90d0533a3e4fd95e635124cb +golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb google.golang.org/api 9bf6e6e569ff057f75d9604a46c52928f17d2b54 google.golang.org/appengine 12d5545dc1cfa6047a286d5e853841b6471f4c19 google.golang.org/cloud 975617b05ea8a58727e6c1a06b6161ff4185a9f2 diff --git a/components/engine/vendor/github.com/docker/go-events/broadcast.go b/components/engine/vendor/github.com/docker/go-events/broadcast.go index ee0a894ad8..5120078dfb 100644 --- a/components/engine/vendor/github.com/docker/go-events/broadcast.go +++ b/components/engine/vendor/github.com/docker/go-events/broadcast.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // Broadcaster sends events to multiple, reliable Sinks. The goal of this @@ -160,7 +160,7 @@ func (b *Broadcaster) run() { } } -func (b Broadcaster) String() string { +func (b *Broadcaster) String() string { // Serialize copy of this broadcaster without the sync.Once, to avoid // a data race. diff --git a/components/engine/vendor/github.com/docker/go-events/channel.go b/components/engine/vendor/github.com/docker/go-events/channel.go index de95fa4017..802cf51ffe 100644 --- a/components/engine/vendor/github.com/docker/go-events/channel.go +++ b/components/engine/vendor/github.com/docker/go-events/channel.go @@ -50,7 +50,7 @@ func (ch *Channel) Close() error { return nil } -func (ch Channel) String() string { +func (ch *Channel) String() string { // Serialize a copy of the Channel that doesn't contain the sync.Once, // to avoid a data race. ch2 := map[string]interface{}{ diff --git a/components/engine/vendor/github.com/docker/go-events/queue.go b/components/engine/vendor/github.com/docker/go-events/queue.go index cbd657cff4..4bb770afc2 100644 --- a/components/engine/vendor/github.com/docker/go-events/queue.go +++ b/components/engine/vendor/github.com/docker/go-events/queue.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // Queue accepts all messages into a queue for asynchronous consumption @@ -31,7 +31,7 @@ func NewQueue(dst Sink) *Queue { } // Write accepts the events into the queue, only failing if the queue has -// beend closed. +// been closed. func (eq *Queue) Write(event Event) error { eq.mu.Lock() defer eq.mu.Unlock() diff --git a/components/engine/vendor/github.com/docker/go-events/retry.go b/components/engine/vendor/github.com/docker/go-events/retry.go index 55d40dce9e..2df55d2160 100644 --- a/components/engine/vendor/github.com/docker/go-events/retry.go +++ b/components/engine/vendor/github.com/docker/go-events/retry.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // RetryingSink retries the write until success or an ErrSinkClosed is @@ -90,7 +90,7 @@ func (rs *RetryingSink) Close() error { return nil } -func (rs RetryingSink) String() string { +func (rs *RetryingSink) String() string { // Serialize a copy of the RetryingSink without the sync.Once, to avoid // a data race. rs2 := map[string]interface{}{ diff --git a/components/engine/vendor/github.com/docker/libnetwork/agent.go b/components/engine/vendor/github.com/docker/libnetwork/agent.go index 4877df1c34..daf6936b7e 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/agent.go +++ b/components/engine/vendor/github.com/docker/libnetwork/agent.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/bitseq/sequence.go b/components/engine/vendor/github.com/docker/libnetwork/bitseq/sequence.go index 86cf69b34f..e3a5bb563b 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/bitseq/sequence.go +++ b/components/engine/vendor/github.com/docker/libnetwork/bitseq/sequence.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/config/config.go b/components/engine/vendor/github.com/docker/libnetwork/config/config.go index a2e43e3a53..96a157a1fb 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/config/config.go +++ b/components/engine/vendor/github.com/docker/libnetwork/config/config.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/controller.go b/components/engine/vendor/github.com/docker/libnetwork/controller.go index 1696e07067..801097ab99 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/controller.go +++ b/components/engine/vendor/github.com/docker/libnetwork/controller.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/default_gateway.go b/components/engine/vendor/github.com/docker/libnetwork/default_gateway.go index bf1592435f..9a60fd6758 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/default_gateway.go +++ b/components/engine/vendor/github.com/docker/libnetwork/default_gateway.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge.go index dd79f04d91..64a2743dcf 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge_store.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge_store.go index c7c83d8369..b0e4ff02b5 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/bridge_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/interface.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/interface.go index 9b20900416..c9f3e8dfb7 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/interface.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/interface.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/link.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/link.go index 53e9eeef99..d364516f1a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/link.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/link.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go index 965cc9a039..48010e9c59 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/port_mapping.go @@ -6,8 +6,8 @@ import ( "fmt" "net" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/types" + "github.com/sirupsen/logrus" ) var ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_bridgenetfiltering.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_bridgenetfiltering.go index 884c7115ec..9b90acfac2 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_bridgenetfiltering.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_bridgenetfiltering.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_device.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_device.go index 0961bea55d..a9dfd06771 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_device.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_device.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go index d46f8ddf83..355a14d996 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_forwarding.go @@ -4,8 +4,8 @@ import ( "fmt" "io/ioutil" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/iptables" + "github.com/sirupsen/logrus" ) const ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go index 769debcb80..f01b08dea0 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ip_tables.go @@ -5,8 +5,8 @@ import ( "fmt" "net" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/iptables" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go index 7f8707266d..671bd3302e 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv4.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv6.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv6.go index ee3d753ac1..b944be081e 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv6.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_ipv6.go @@ -6,8 +6,8 @@ import ( "net" "os" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/types" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_verify.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_verify.go index 330a5b4560..de77c38a66 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_verify.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/bridge/setup_verify.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_endpoint.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_endpoint.go index d30aeac9b5..1fe44f2e71 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_endpoint.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_endpoint.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_joinleave.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_joinleave.go index 0c08dfce5d..9d229a245e 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_joinleave.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_joinleave.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_network.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_network.go index 801fc20a7e..a9544b5a95 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_network.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_setup.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_setup.go index 75f08210fb..0c39ec9d27 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_setup.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_setup.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/ns" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_state.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_state.go index 2d8cb2d8f6..2a4ad25b40 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_state.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_state.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_store.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_store.go index de994fa7f8..197e29966a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/ipvlan/ipvlan_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_endpoint.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_endpoint.go index 3e5ccb29f8..d9fae57185 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_endpoint.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_endpoint.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_joinleave.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_joinleave.go index cf5c2a4bf9..778613db77 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_joinleave.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_joinleave.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_network.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_network.go index c455b9124d..914c6cdf64 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_network.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_setup.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_setup.go index b5b4be3499..843a2e73bf 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_setup.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_setup.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/ns" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_state.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_state.go index 8ac3d282f9..8fd1a9e4dc 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_state.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_state.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_store.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_store.go index 3fd92786bf..655a49c08b 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/macvlan/macvlan_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/encryption.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/encryption.go index 1d59f238b0..f12d7a8c67 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/encryption.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/encryption.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/filter.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/filter.go index 40cd7d9f28..1601803aa0 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/filter.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/filter.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/iptables" + "github.com/sirupsen/logrus" ) const globalChain = "DOCKER-OVERLAY" diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/joinleave.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/joinleave.go index cdbb428281..0917a983af 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/joinleave.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/joinleave.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ostweaks_linux.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ostweaks_linux.go index 85840cf8c4..c00243ad2c 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ostweaks_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ostweaks_linux.go @@ -5,7 +5,7 @@ import ( "path" "strings" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var sysctlConf = map[string]string{ diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_endpoint.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_endpoint.go index ebcab51501..d0e63f6b7e 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_endpoint.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_endpoint.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go index 01f6287bed..449bf80d3c 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go @@ -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" diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_serf.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_serf.go index 9002bce6b7..c56839a9d7 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_serf.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_serf.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/Sirupsen/logrus" "github.com/hashicorp/serf/serf" + "github.com/sirupsen/logrus" ) type ovNotify struct { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_utils.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_utils.go index 8a01914fa4..27f57c1fe2 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_utils.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_utils.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/overlay.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/overlay.go index 8d19b2e1d4..1c947619a8 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/overlay.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/overlay.go @@ -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" ) const ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ovmanager/ovmanager.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ovmanager/ovmanager.go index 3c3c0bb257..a80f335892 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ovmanager/ovmanager.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ovmanager/ovmanager.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/peerdb.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/peerdb.go index 21cd1fbe3d..254e8643f5 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/peerdb.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/peerdb.go @@ -6,7 +6,7 @@ import ( "sync" "syscall" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) const ovPeerTable = "overlay_peer_table" diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/remote/driver.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/remote/driver.go index ffe0730c95..b52163025a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/remote/driver.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/remote/driver.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go index 2547016a4b..558157abe4 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge_store.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge_store.go index 956e82902f..6f5db4f5b9 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/bridge_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go index 1cf22c13c9..3b67db388a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go @@ -10,8 +10,8 @@ import ( "os" "os/exec" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/types" + "github.com/sirupsen/logrus" ) var ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/encryption.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/encryption.go index ca7b60b4c7..0af3474b93 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/encryption.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/encryption.go @@ -9,8 +9,8 @@ import ( "net" "sync" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/types" + "github.com/sirupsen/logrus" ) const ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/joinleave.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/joinleave.go index fd411988d1..ff03f3ccb6 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/joinleave.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/joinleave.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_endpoint.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_endpoint.go index ca0c477dcd..21b33ffe85 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_endpoint.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_endpoint.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_network.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_network.go index b0567261c7..b545bc8903 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_network.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_serf.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_serf.go index 53c59b4df2..ddc0509064 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_serf.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/ov_serf.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/Sirupsen/logrus" "github.com/hashicorp/serf/serf" + "github.com/sirupsen/logrus" ) type ovNotify struct { diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/overlay.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/overlay.go index 0a5a1bfdce..45b62b1835 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/overlay.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/overlay.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/peerdb.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/peerdb.go index d1499e2132..23d9a9729b 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/peerdb.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/solaris/overlay/peerdb.go @@ -5,7 +5,7 @@ import ( "net" "sync" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) const ovPeerTable = "overlay_peer_table" diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/joinleave_windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/joinleave_windows.go index 91dcf28b32..cded48af64 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/joinleave_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/joinleave_windows.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go index 3e45115df7..47af64cb9a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_endpoint_windows.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_network_windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_network_windows.go index 65b7e38d3b..70c4f02eda 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_network_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/ov_network_windows.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/overlay_windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/overlay_windows.go index 111e517dbd..d415bebcbd 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/overlay_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/overlay_windows.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/peerdb_windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/peerdb_windows.go index 04581f784a..0abc232432 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/peerdb_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/overlay/peerdb_windows.go @@ -6,8 +6,8 @@ import ( "encoding/json" - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/types" + "github.com/sirupsen/logrus" "github.com/Microsoft/hcsshim" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows.go index 19b2e685b4..45f835ee07 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows_store.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows_store.go index bbed5aeaa2..caa93c68fb 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/drivers/windows/windows_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/endpoint.go b/components/engine/vendor/github.com/docker/libnetwork/endpoint.go index 111b747352..724d0e5315 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/endpoint.go +++ b/components/engine/vendor/github.com/docker/libnetwork/endpoint.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/firewall_linux.go b/components/engine/vendor/github.com/docker/libnetwork/firewall_linux.go index 8c27c1dd25..b2232ac7a5 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/firewall_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/firewall_linux.go @@ -1,8 +1,8 @@ package libnetwork import ( - "github.com/Sirupsen/logrus" "github.com/docker/libnetwork/iptables" + "github.com/sirupsen/logrus" ) const userChain = "DOCKER-USER" diff --git a/components/engine/vendor/github.com/docker/libnetwork/hostdiscovery/hostdiscovery.go b/components/engine/vendor/github.com/docker/libnetwork/hostdiscovery/hostdiscovery.go index a45ecb60a3..452b5628c1 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/hostdiscovery/hostdiscovery.go +++ b/components/engine/vendor/github.com/docker/libnetwork/hostdiscovery/hostdiscovery.go @@ -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" diff --git a/components/engine/vendor/github.com/docker/libnetwork/ipam/allocator.go b/components/engine/vendor/github.com/docker/libnetwork/ipam/allocator.go index b3876ffded..71c9f39531 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ipam/allocator.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ipam/allocator.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/ipam/store.go b/components/engine/vendor/github.com/docker/libnetwork/ipam/store.go index d05e1b70b9..124d585518 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ipam/store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ipam/store.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/ipams/remote/remote.go b/components/engine/vendor/github.com/docker/libnetwork/ipams/remote/remote.go index d2e2b4f3c8..9f2f1d5fed 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ipams/remote/remote.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ipams/remote/remote.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/ipams/windowsipam/windowsipam.go b/components/engine/vendor/github.com/docker/libnetwork/ipams/windowsipam/windowsipam.go index 6b124d40d2..9cf99d42b1 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ipams/windowsipam/windowsipam.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ipams/windowsipam/windowsipam.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/iptables/conntrack.go b/components/engine/vendor/github.com/docker/libnetwork/iptables/conntrack.go index 5731c53c04..08317c33ee 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/iptables/conntrack.go +++ b/components/engine/vendor/github.com/docker/libnetwork/iptables/conntrack.go @@ -5,7 +5,7 @@ import ( "net" "syscall" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/iptables/firewalld.go b/components/engine/vendor/github.com/docker/libnetwork/iptables/firewalld.go index 7dc5127fa4..c9838d5b65 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/iptables/firewalld.go +++ b/components/engine/vendor/github.com/docker/libnetwork/iptables/firewalld.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/Sirupsen/logrus" "github.com/godbus/dbus" + "github.com/sirupsen/logrus" ) // IPV defines the table string diff --git a/components/engine/vendor/github.com/docker/libnetwork/iptables/iptables.go b/components/engine/vendor/github.com/docker/libnetwork/iptables/iptables.go index caa202b366..ecce0d3b2a 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/iptables/iptables.go +++ b/components/engine/vendor/github.com/docker/libnetwork/iptables/iptables.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // Action signifies the iptable action. diff --git a/components/engine/vendor/github.com/docker/libnetwork/ipvs/netlink.go b/components/engine/vendor/github.com/docker/libnetwork/ipvs/netlink.go index 5450679c3b..b8d33dcdc4 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ipvs/netlink.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ipvs/netlink.go @@ -14,7 +14,7 @@ import ( "syscall" "unsafe" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink/nl" "github.com/vishvananda/netns" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/network.go b/components/engine/vendor/github.com/docker/libnetwork/network.go index 72deeea660..3f44553b9d 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/network.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/network_windows.go b/components/engine/vendor/github.com/docker/libnetwork/network_windows.go index ddcd3345f2..388b811421 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/network_windows.go +++ b/components/engine/vendor/github.com/docker/libnetwork/network_windows.go @@ -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()) { diff --git a/components/engine/vendor/github.com/docker/libnetwork/networkdb/cluster.go b/components/engine/vendor/github.com/docker/libnetwork/networkdb/cluster.go index e011a5336e..264fd3ca49 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/networkdb/cluster.go +++ b/components/engine/vendor/github.com/docker/libnetwork/networkdb/cluster.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/Sirupsen/logrus" "github.com/hashicorp/memberlist" + "github.com/sirupsen/logrus" ) const ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/networkdb/delegate.go b/components/engine/vendor/github.com/docker/libnetwork/networkdb/delegate.go index b3ef000d7e..73163c11f1 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/networkdb/delegate.go +++ b/components/engine/vendor/github.com/docker/libnetwork/networkdb/delegate.go @@ -5,8 +5,8 @@ import ( "net" "strings" - "github.com/Sirupsen/logrus" "github.com/gogo/protobuf/proto" + "github.com/sirupsen/logrus" ) type delegate struct { diff --git a/components/engine/vendor/github.com/docker/libnetwork/networkdb/event_delegate.go b/components/engine/vendor/github.com/docker/libnetwork/networkdb/event_delegate.go index 23e16832e7..5c4bb00621 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/networkdb/event_delegate.go +++ b/components/engine/vendor/github.com/docker/libnetwork/networkdb/event_delegate.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net" - "github.com/Sirupsen/logrus" "github.com/hashicorp/memberlist" + "github.com/sirupsen/logrus" ) type eventDelegate struct { diff --git a/components/engine/vendor/github.com/docker/libnetwork/networkdb/networkdb.go b/components/engine/vendor/github.com/docker/libnetwork/networkdb/networkdb.go index e4cc9df12c..920318d4f5 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/networkdb/networkdb.go +++ b/components/engine/vendor/github.com/docker/libnetwork/networkdb/networkdb.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/ns/init_linux.go b/components/engine/vendor/github.com/docker/libnetwork/ns/init_linux.go index 84d4950750..567a6242ac 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/ns/init_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/ns/init_linux.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/osl/interface_linux.go b/components/engine/vendor/github.com/docker/libnetwork/osl/interface_linux.go index 8e8a830ce9..60583bd80f 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/osl/interface_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/osl/interface_linux.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/osl/namespace_linux.go b/components/engine/vendor/github.com/docker/libnetwork/osl/namespace_linux.go index d6b9d78234..33a84f598b 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/osl/namespace_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/osl/namespace_linux.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/osl/neigh_linux.go b/components/engine/vendor/github.com/docker/libnetwork/osl/neigh_linux.go index 161ffa7beb..dc1d300c01 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/osl/neigh_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/osl/neigh_linux.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/portmapper/mapper.go b/components/engine/vendor/github.com/docker/libnetwork/portmapper/mapper.go index 7f2a67c89f..f480edae03 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/portmapper/mapper.go +++ b/components/engine/vendor/github.com/docker/libnetwork/portmapper/mapper.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go b/components/engine/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go index 9da6922e2b..5cb251b131 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go +++ b/components/engine/vendor/github.com/docker/libnetwork/resolvconf/resolvconf.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/resolver.go b/components/engine/vendor/github.com/docker/libnetwork/resolver.go index ff472d0019..d382e7f67d 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/resolver.go +++ b/components/engine/vendor/github.com/docker/libnetwork/resolver.go @@ -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 diff --git a/components/engine/vendor/github.com/docker/libnetwork/resolver_unix.go b/components/engine/vendor/github.com/docker/libnetwork/resolver_unix.go index 5fcc6b9fa9..b35009ee74 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/resolver_unix.go +++ b/components/engine/vendor/github.com/docker/libnetwork/resolver_unix.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/sandbox.go b/components/engine/vendor/github.com/docker/libnetwork/sandbox.go index 46674067a1..167bc301a2 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/sandbox.go +++ b/components/engine/vendor/github.com/docker/libnetwork/sandbox.go @@ -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. diff --git a/components/engine/vendor/github.com/docker/libnetwork/sandbox_dns_unix.go b/components/engine/vendor/github.com/docker/libnetwork/sandbox_dns_unix.go index 867cc8abb4..f18f0b3ee6 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/sandbox_dns_unix.go +++ b/components/engine/vendor/github.com/docker/libnetwork/sandbox_dns_unix.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go b/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go index c33398f953..f4c4276848 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go +++ b/components/engine/vendor/github.com/docker/libnetwork/sandbox_externalkey_unix.go @@ -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/" diff --git a/components/engine/vendor/github.com/docker/libnetwork/sandbox_store.go b/components/engine/vendor/github.com/docker/libnetwork/sandbox_store.go index b92a544dc9..a083644598 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/sandbox_store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/sandbox_store.go @@ -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 ( diff --git a/components/engine/vendor/github.com/docker/libnetwork/service_common.go b/components/engine/vendor/github.com/docker/libnetwork/service_common.go index 7e3367c71c..64d283e541 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/service_common.go +++ b/components/engine/vendor/github.com/docker/libnetwork/service_common.go @@ -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 { diff --git a/components/engine/vendor/github.com/docker/libnetwork/service_linux.go b/components/engine/vendor/github.com/docker/libnetwork/service_linux.go index 784c1784ec..00665941ed 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/service_linux.go +++ b/components/engine/vendor/github.com/docker/libnetwork/service_linux.go @@ -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" ) diff --git a/components/engine/vendor/github.com/docker/libnetwork/store.go b/components/engine/vendor/github.com/docker/libnetwork/store.go index 398794bfef..1a897bfe01 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/store.go +++ b/components/engine/vendor/github.com/docker/libnetwork/store.go @@ -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() { diff --git a/components/engine/vendor/github.com/docker/swarmkit/agent/exec/controller.go b/components/engine/vendor/github.com/docker/swarmkit/agent/exec/controller.go index 1cafb47fd1..85110ba971 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/agent/exec/controller.go +++ b/components/engine/vendor/github.com/docker/swarmkit/agent/exec/controller.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/equality" "github.com/docker/swarmkit/log" "github.com/docker/swarmkit/protobuf/ptypes" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/agent/session.go b/components/engine/vendor/github.com/docker/swarmkit/agent/session.go index faa1fa8cac..0c00c4f1bf 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/agent/session.go +++ b/components/engine/vendor/github.com/docker/swarmkit/agent/session.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/connectionbroker" "github.com/docker/swarmkit/log" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/components/engine/vendor/github.com/docker/swarmkit/agent/worker.go b/components/engine/vendor/github.com/docker/swarmkit/agent/worker.go index ff138c2b74..6b500059a8 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/agent/worker.go +++ b/components/engine/vendor/github.com/docker/swarmkit/agent/worker.go @@ -3,12 +3,12 @@ package agent import ( "sync" - "github.com/Sirupsen/logrus" "github.com/boltdb/bolt" "github.com/docker/swarmkit/agent/exec" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/log" "github.com/docker/swarmkit/watch" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/ca/auth.go b/components/engine/vendor/github.com/docker/swarmkit/ca/auth.go index 10cb2c76a1..488d34dd33 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/ca/auth.go +++ b/components/engine/vendor/github.com/docker/swarmkit/ca/auth.go @@ -5,7 +5,7 @@ import ( "crypto/x509/pkix" "strings" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/log" diff --git a/components/engine/vendor/github.com/docker/swarmkit/ca/config.go b/components/engine/vendor/github.com/docker/swarmkit/ca/config.go index cfaccd00b9..3731df1c49 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/ca/config.go +++ b/components/engine/vendor/github.com/docker/swarmkit/ca/config.go @@ -12,7 +12,6 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" cfconfig "github.com/cloudflare/cfssl/config" events "github.com/docker/go-events" "github.com/docker/swarmkit/api" @@ -22,6 +21,7 @@ import ( "github.com/docker/swarmkit/watch" "github.com/opencontainers/go-digest" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "google.golang.org/grpc/credentials" "golang.org/x/net/context" diff --git a/components/engine/vendor/github.com/docker/swarmkit/ca/external.go b/components/engine/vendor/github.com/docker/swarmkit/ca/external.go index ef76e2fbe5..47c8dd8f80 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/ca/external.go +++ b/components/engine/vendor/github.com/docker/swarmkit/ca/external.go @@ -14,13 +14,13 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/cloudflare/cfssl/api" "github.com/cloudflare/cfssl/config" "github.com/cloudflare/cfssl/csr" "github.com/cloudflare/cfssl/signer" "github.com/docker/swarmkit/log" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "golang.org/x/net/context/ctxhttp" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/ca/renewer.go b/components/engine/vendor/github.com/docker/swarmkit/ca/renewer.go index 6d0229bd1d..2a2fae7808 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/ca/renewer.go +++ b/components/engine/vendor/github.com/docker/swarmkit/ca/renewer.go @@ -4,11 +4,11 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/docker/go-events" "github.com/docker/swarmkit/connectionbroker" "github.com/docker/swarmkit/log" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/ca/server.go b/components/engine/vendor/github.com/docker/swarmkit/ca/server.go index cb3b6acdc1..33a6367695 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/ca/server.go +++ b/components/engine/vendor/github.com/docker/swarmkit/ca/server.go @@ -7,7 +7,6 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/equality" "github.com/docker/swarmkit/identity" @@ -15,6 +14,7 @@ import ( "github.com/docker/swarmkit/manager/state/store" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/components/engine/vendor/github.com/docker/swarmkit/log/context.go b/components/engine/vendor/github.com/docker/swarmkit/log/context.go index ce7da930ba..ac4f848806 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/log/context.go +++ b/components/engine/vendor/github.com/docker/swarmkit/log/context.go @@ -3,7 +3,7 @@ package log import ( "path" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/config.go b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/config.go index 3a6f6a19ee..d0fe8a56c1 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/config.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/config.go @@ -4,11 +4,11 @@ import ( "bytes" "strings" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/identity" "github.com/docker/swarmkit/log" "github.com/docker/swarmkit/manager/state/store" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go index 23708146d6..2f8d2559cf 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/controlapi/secret.go @@ -4,12 +4,12 @@ import ( "crypto/subtle" "strings" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/validation" "github.com/docker/swarmkit/identity" "github.com/docker/swarmkit/log" "github.com/docker/swarmkit/manager/state/store" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go b/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go index 3f17a6d20f..4373e99d59 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/assignments.go @@ -3,12 +3,12 @@ package dispatcher import ( "fmt" - "github.com/Sirupsen/logrus" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/equality" "github.com/docker/swarmkit/api/validation" "github.com/docker/swarmkit/manager/drivers" "github.com/docker/swarmkit/manager/state/store" + "github.com/sirupsen/logrus" ) // Used as a key in tasksUsingDependency and changes. Only using the diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go b/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go index 8ec3ae27df..cb630047ba 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/dispatcher/dispatcher.go @@ -11,7 +11,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/transport" - "github.com/Sirupsen/logrus" "github.com/docker/go-events" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/api/equality" @@ -23,6 +22,7 @@ import ( "github.com/docker/swarmkit/watch" gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go b/components/engine/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go index f5ec2b30bd..7f064bb91c 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/logbroker/broker.go @@ -9,7 +9,6 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/Sirupsen/logrus" "github.com/docker/go-events" "github.com/docker/swarmkit/api" "github.com/docker/swarmkit/ca" @@ -17,6 +16,7 @@ import ( "github.com/docker/swarmkit/log" "github.com/docker/swarmkit/manager/state/store" "github.com/docker/swarmkit/watch" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go b/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go index 4771c9dcbe..0b64a9a69c 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/manager.go @@ -13,7 +13,6 @@ import ( "syscall" "time" - "github.com/Sirupsen/logrus" "github.com/cloudflare/cfssl/helpers" "github.com/docker/docker/pkg/plugingetter" "github.com/docker/go-events" @@ -45,6 +44,7 @@ import ( gogotypes "github.com/gogo/protobuf/types" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/components/engine/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go b/components/engine/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go index b793374095..b37953829a 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go +++ b/components/engine/vendor/github.com/docker/swarmkit/manager/state/raft/raft.go @@ -9,7 +9,6 @@ import ( "sync/atomic" "time" - "github.com/Sirupsen/logrus" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/raft" "github.com/coreos/etcd/raft/raftpb" @@ -28,6 +27,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pivotal-golang/clock" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/components/engine/vendor/github.com/docker/swarmkit/node/node.go b/components/engine/vendor/github.com/docker/swarmkit/node/node.go index 77fe5b3d75..a6a747216b 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/node/node.go +++ b/components/engine/vendor/github.com/docker/swarmkit/node/node.go @@ -14,7 +14,6 @@ import ( "sync" "time" - "github.com/Sirupsen/logrus" "github.com/boltdb/bolt" "github.com/docker/docker/pkg/plugingetter" metrics "github.com/docker/go-metrics" @@ -31,6 +30,7 @@ import ( "github.com/docker/swarmkit/xnet" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/components/engine/vendor/github.com/docker/swarmkit/watch/queue/queue.go b/components/engine/vendor/github.com/docker/swarmkit/watch/queue/queue.go index 10bdb92080..bb6f92da37 100644 --- a/components/engine/vendor/github.com/docker/swarmkit/watch/queue/queue.go +++ b/components/engine/vendor/github.com/docker/swarmkit/watch/queue/queue.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/Sirupsen/logrus" "github.com/docker/go-events" + "github.com/sirupsen/logrus" ) // ErrQueueFull is returned by a Write operation when that Write causes the diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go index fedb563abe..1c52ce6fe4 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/config.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/Microsoft/hcsshim" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // Mode is the operational mode, both requested, and actual after verification diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/createsandbox.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/createsandbox.go index 65971601a1..bb808b538e 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/createsandbox.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/createsandbox.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // CreateSandbox does what it says on the tin. This is done by copying a prebuilt-sandbox from the ServiceVM. diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go index c0545925f7..12ceab3ee0 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotaddvhd.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/Microsoft/hcsshim" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // HotAddVhd hot-adds a VHD to a utility VM. This is used in the global one-utility-VM- diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go index 1f3d21aa81..1923c012f2 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/hotremovevhd.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/Microsoft/hcsshim" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // HotRemoveVhd hot-removes a VHD from a utility VM. This is used in the global one-utility-VM- diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go index 02655227a9..25299a3739 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/process.go @@ -7,7 +7,7 @@ import ( "io" "github.com/Microsoft/hcsshim" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // Process is the structure pertaining to a process running in a utility VM. diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go index 3560245b49..39db903262 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/tartovhd.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // TarToVhd streams a tarstream contained in an io.Reader to a fixed vhd file diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go index 8976dc0af9..cd779f15c4 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/utilities.go @@ -10,7 +10,7 @@ import ( "time" "unsafe" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) var ( diff --git a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go index bdbd381929..27225a71e7 100644 --- a/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go +++ b/components/engine/vendor/github.com/jhowardmsft/opengcs/gogcs/client/vhdtotar.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" ) // VhdToTar does what is says - it exports a VHD in a specified diff --git a/components/engine/vendor/github.com/moby/buildkit/session/filesync/diffcopy.go b/components/engine/vendor/github.com/moby/buildkit/session/filesync/diffcopy.go index 533847acdf..58b29686cc 100644 --- a/components/engine/vendor/github.com/moby/buildkit/session/filesync/diffcopy.go +++ b/components/engine/vendor/github.com/moby/buildkit/session/filesync/diffcopy.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/Sirupsen/logrus" + "github.com/sirupsen/logrus" "github.com/tonistiigi/fsutil" ) diff --git a/components/engine/vendor/github.com/moby/buildkit/session/filesync/tarstream.go b/components/engine/vendor/github.com/moby/buildkit/session/filesync/tarstream.go index da139ebf5d..5cab867498 100644 --- a/components/engine/vendor/github.com/moby/buildkit/session/filesync/tarstream.go +++ b/components/engine/vendor/github.com/moby/buildkit/session/filesync/tarstream.go @@ -3,10 +3,10 @@ package filesync import ( "io" - "github.com/Sirupsen/logrus" "github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/chrootarchive" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "google.golang.org/grpc" ) diff --git a/components/engine/vendor/github.com/moby/buildkit/session/grpc.go b/components/engine/vendor/github.com/moby/buildkit/session/grpc.go index 0f20b15047..71d77bf448 100644 --- a/components/engine/vendor/github.com/moby/buildkit/session/grpc.go +++ b/components/engine/vendor/github.com/moby/buildkit/session/grpc.go @@ -4,8 +4,8 @@ import ( "net" "time" - "github.com/Sirupsen/logrus" "github.com/pkg/errors" + "github.com/sirupsen/logrus" "golang.org/x/net/context" "golang.org/x/net/http2" "google.golang.org/grpc" diff --git a/components/engine/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go b/components/engine/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go index 98f4b8585f..d681ad78c2 100644 --- a/components/engine/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go +++ b/components/engine/vendor/github.com/opencontainers/runc/libcontainer/configs/config.go @@ -7,8 +7,8 @@ import ( "os/exec" "time" - "github.com/Sirupsen/logrus" "github.com/opencontainers/runtime-spec/specs-go" + "github.com/sirupsen/logrus" ) type Rlimit struct {