Merge pull request #13734 from aboch/master
Fix for #13720. Unpublished ports missing in docker ps
This commit is contained in:
commit
b63ec6e4b1
|
@ -513,13 +513,23 @@ func (container *Container) buildPortMapInfo(n libnetwork.Network, ep libnetwork
|
||||||
networkSettings.MacAddress = mac.(net.HardwareAddr).String()
|
networkSettings.MacAddress = mac.(net.HardwareAddr).String()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
networkSettings.Ports = nat.PortMap{}
|
||||||
|
|
||||||
|
if expData, ok := driverInfo[netlabel.ExposedPorts]; ok {
|
||||||
|
if exposedPorts, ok := expData.([]types.TransportPort); ok {
|
||||||
|
for _, tp := range exposedPorts {
|
||||||
|
natPort := nat.NewPort(tp.Proto.String(), strconv.Itoa(int(tp.Port)))
|
||||||
|
networkSettings.Ports[natPort] = nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
mapData, ok := driverInfo[netlabel.PortMap]
|
mapData, ok := driverInfo[netlabel.PortMap]
|
||||||
if !ok {
|
if !ok {
|
||||||
return networkSettings, nil
|
return networkSettings, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if portMapping, ok := mapData.([]types.PortBinding); ok {
|
if portMapping, ok := mapData.([]types.PortBinding); ok {
|
||||||
networkSettings.Ports = nat.PortMap{}
|
|
||||||
for _, pp := range portMapping {
|
for _, pp := range portMapping {
|
||||||
natPort := nat.NewPort(pp.Proto.String(), strconv.Itoa(int(pp.Port)))
|
natPort := nat.NewPort(pp.Proto.String(), strconv.Itoa(int(pp.Port)))
|
||||||
natBndg := nat.PortBinding{HostIp: pp.HostIP.String(), HostPort: strconv.Itoa(int(pp.HostPort))}
|
natBndg := nat.PortBinding{HostIp: pp.HostIP.String(), HostPort: strconv.Itoa(int(pp.HostPort))}
|
||||||
|
|
|
@ -55,7 +55,7 @@ clone hg code.google.com/p/go.net 84a4013f96e0
|
||||||
clone hg code.google.com/p/gosqlite 74691fb6f837
|
clone hg code.google.com/p/gosqlite 74691fb6f837
|
||||||
|
|
||||||
#get libnetwork packages
|
#get libnetwork packages
|
||||||
clone git github.com/docker/libnetwork 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
|
clone git github.com/docker/libnetwork f72ad20491e8c46d9664da3f32a0eddb301e7c8d
|
||||||
clone git github.com/vishvananda/netns 008d17ae001344769b031375bdb38a86219154c6
|
clone git github.com/vishvananda/netns 008d17ae001344769b031375bdb38a86219154c6
|
||||||
clone git github.com/vishvananda/netlink 8eb64238879fed52fd51c5b30ad20b928fb4c36c
|
clone git github.com/vishvananda/netlink 8eb64238879fed52fd51c5b30ad20b928fb4c36c
|
||||||
|
|
||||||
|
|
|
@ -686,6 +686,15 @@ func (d *driver) EndpointOperInfo(nid, eid types.UUID) (map[string]interface{},
|
||||||
|
|
||||||
m := make(map[string]interface{})
|
m := make(map[string]interface{})
|
||||||
|
|
||||||
|
if ep.config.ExposedPorts != nil {
|
||||||
|
// Return a copy of the config data
|
||||||
|
epc := make([]types.TransportPort, 0, len(ep.config.ExposedPorts))
|
||||||
|
for _, tp := range ep.config.ExposedPorts {
|
||||||
|
epc = append(epc, tp.GetCopy())
|
||||||
|
}
|
||||||
|
m[netlabel.ExposedPorts] = epc
|
||||||
|
}
|
||||||
|
|
||||||
if ep.portMapping != nil {
|
if ep.portMapping != nil {
|
||||||
// Return a copy of the operational data
|
// Return a copy of the operational data
|
||||||
pmc := make([]types.PortBinding, 0, len(ep.portMapping))
|
pmc := make([]types.PortBinding, 0, len(ep.portMapping))
|
||||||
|
|
Loading…
Reference in New Issue