Merge pull request #57 from besolov/issue-56

issue-56 fix incorrect SortPortMap behaviour in case of empty binding

Author: thaJeztah

nat/sort.go

@@ -58,7 +58,7 @@ func (s portMapSorter) Less(i, j int) bool {
 func SortPortMap(ports []Port, bindings PortMap) {
 	s := portMapSorter{}
 	for _, p := range ports {
-		if binding, ok := bindings[p]; ok {
+		if binding, ok := bindings[p]; ok && len(binding) > 0 {
 			for _, b := range binding {
 				s = append(s, portMapEntry{port: p, binding: b})
 			}

nat/sort_test.go

@@ -46,6 +46,7 @@ func TestSortPortMap(t *testing.T) {
 		Port("22/tcp"),
 		Port("22/udp"),
 		Port("8000/tcp"),
+		Port("8443/tcp"),
 		Port("6379/tcp"),
 		Port("9999/tcp"),
 	}
@@ -57,6 +58,7 @@ func TestSortPortMap(t *testing.T) {
 		Port("8000/tcp"): []PortBinding{
 			{},
 		},
+		Port("8443/tcp"): []PortBinding{},
 		Port("6379/tcp"): []PortBinding{
 			{},
 			{HostIP: "0.0.0.0", HostPort: "32749"},
@@ -70,6 +72,7 @@ func TestSortPortMap(t *testing.T) {
 	if !reflect.DeepEqual(ports, []Port{
 		Port("9999/tcp"),
 		Port("6379/tcp"),
+		Port("8443/tcp"),
 		Port("8000/tcp"),
 		Port("22/tcp"),
 		Port("22/udp"),