clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13424 from mavenugo/vendorin

Browse Source 
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
This commit is contained in:
Arnaud Porterie
2015-05-23 21:08:58 -07:00
parent bce3e761c0 a3d22c764c
commit f83073d3eb
57 changed files with 3369 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/container_linux.go
+7 -7
View File
@@ -30,8 +30,8 @@ import (
"github.com/docker/libcontainer/devices"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/netutils"
"github.com/docker/libnetwork/options"
"github.com/docker/libnetwork/types"
)
const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
@@ -495,7 +495,7 @@ func (container *Container) buildPortMapInfo(n libnetwork.Network, ep libnetwork
return networkSettings, nil
}
if portMapping, ok := mapData.([]netutils.PortBinding); ok {
if portMapping, ok := mapData.([]types.PortBinding); ok {
networkSettings.Ports = nat.PortMap{}
for _, pp := range portMapping {
natPort := nat.NewPort(pp.Proto.String(), strconv.Itoa(int(pp.Port)))
@@ -634,8 +634,8 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
var (
portSpecs = make(nat.PortSet)
bindings = make(nat.PortMap)
pbList []netutils.PortBinding
exposeList []netutils.TransportPort
pbList []types.PortBinding
exposeList []types.TransportPort
createOptions []libnetwork.EndpointOption
)
@@ -675,12 +675,12 @@ func (container *Container) buildCreateEndpointOptions() ([]libnetwork.EndpointO
}
nat.SortPortMap(ports, bindings)
for _, port := range ports {
expose := netutils.TransportPort{}
expose.Proto = netutils.ParseProtocol(port.Proto())
expose := types.TransportPort{}
expose.Proto = types.ParseProtocol(port.Proto())
expose.Port = uint16(port.Int())
exposeList = append(exposeList, expose)
pb := netutils.PortBinding{Port: expose.Port, Proto: expose.Proto}
pb := types.PortBinding{Port: expose.Port, Proto: expose.Proto}
binding := bindings[port]
for i := 0; i < len(binding); i++ {
pbCopy := pb.GetCopy()