Merge pull request #5752 from crosbymichael/fix-port-mapping-ps

Fix port mapping in ps display for public and private

api/common.go

@@ -2,11 +2,12 @@ package api
 
 import (
 	"fmt"
+	"mime"
+	"strings"
+
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/pkg/version"
 	"github.com/dotcloud/docker/utils"
-	"mime"
-	"strings"
 )
 
 const (
@@ -30,7 +31,7 @@ func DisplayablePorts(ports *engine.Table) string {
 	ports.Sort()
 	for _, port := range ports.Data {
 		if port.Get("IP") == "" {
-			result = append(result, fmt.Sprintf("%d/%s", port.GetInt("PublicPort"), port.Get("Type")))
+			result = append(result, fmt.Sprintf("%d/%s", port.GetInt("PrivatePort"), port.Get("Type")))
 		} else {
 			result = append(result, fmt.Sprintf("%s:%d->%d/%s", port.Get("IP"), port.GetInt("PublicPort"), port.GetInt("PrivatePort"), port.Get("Type")))
 		}

daemon/network_settings.go

@@ -23,7 +23,7 @@ func (settings *NetworkSettings) PortMappingAPI() *engine.Table {
 		p, _ := nat.ParsePort(port.Port())
 		if len(bindings) == 0 {
 			out := &engine.Env{}
-			out.SetInt("PublicPort", p)
+			out.SetInt("PrivatePort", p)
 			out.Set("Type", port.Proto())
 			outs.Add(out)
 			continue