cli/command/container: runPort: sort ports before printing

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

cli/command/container/port.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -11,6 +12,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/completion"
 	"github.com/docker/go-connections/nat"
+	"github.com/fvbommel/sortorder"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -58,6 +60,7 @@ func runPort(dockerCli command.Cli, opts *portOptions) error {
 		return err
 	}
 
+	var out []string
 	if opts.port != "" {
 		port, proto, _ := strings.Cut(opts.port, "/")
 		if proto == "" {
@@ -71,16 +74,22 @@ func runPort(dockerCli command.Cli, opts *portOptions) error {
 			return errors.Errorf("Error: No public port '%s' published for %s", opts.port, opts.container)
 		}
 		for _, frontend := range frontends {
-			_, _ = fmt.Fprintln(dockerCli.Out(), net.JoinHostPort(frontend.HostIP, frontend.HostPort))
+			out = append(out, net.JoinHostPort(frontend.HostIP, frontend.HostPort))
 		}
-		return nil
+	} else {
-	}
-
 		for from, frontends := range c.NetworkSettings.Ports {
 			for _, frontend := range frontends {
-			_, _ = fmt.Fprintf(dockerCli.Out(), "%s -> %s\n", from, net.JoinHostPort(frontend.HostIP, frontend.HostPort))
+				out = append(out, fmt.Sprintf("%s -> %s", from, net.JoinHostPort(frontend.HostIP, frontend.HostPort)))
 			}
 		}
+	}
+
+	if len(out) > 0 {
+		sort.Slice(out, func(i, j int) bool {
+			return sortorder.NaturalLess(out[i], out[j])
+		})
+		_, _ = fmt.Fprintln(dockerCli.Out(), strings.Join(out, "\n"))
+	}
 
 	return nil
 }

cli/command/container/port_test.go

@@ -37,6 +37,10 @@ func TestNewPortCommandOutput(t *testing.T) {
 			ips:  []string{"::", "0.0.0.0"},
 			port: "443/udp",
 		},
+		{
+			name: "container-port-all-ports",
+			ips:  []string{"::", "0.0.0.0"},
+		},
 	}
 	for _, tc := range testCases {
 		tc := tc

cli/command/container/testdata/container-port-all-ports.golden

@@ -0,0 +1,6 @@
+80/tcp -> 0.0.0.0:3456
+80/tcp -> [::]:3456
+443/tcp -> 0.0.0.0:4567
+443/tcp -> [::]:4567
+443/udp -> 0.0.0.0:5678
+443/udp -> [::]:5678

cli/command/container/testdata/container-port-ipv6-and-ipv4-443-udp.golden

@@ -1,2 +1,2 @@
-[::]:5678
 0.0.0.0:5678
+[::]:5678

cli/command/container/testdata/container-port-ipv6-and-ipv4.golden

@@ -1,2 +1,2 @@
-[::]:3456
 0.0.0.0:3456
+[::]:3456