Merge pull request #2028 from pszczekutowicz/master

Sort list of services from swarm stacks using natural sorting
Upstream-commit: 7aa764bba9f328994a781c81deec41cb5c5b391b
Component: cli

Author: silvin-lubecki

components/cli/cli/command/stack/swarm/services.go

@@ -3,13 +3,15 @@ package swarm
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/service"
 	"github.com/docker/cli/cli/command/stack/formatter"
 	"github.com/docker/cli/cli/command/stack/options"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"vbom.ml/util/sortorder"
 )
 
 // RunServices is the swarm implementation of docker stack services
@@ -29,6 +31,9 @@ func RunServices(dockerCli command.Cli, opts options.Services) error {
 		return nil
 	}
 
+	sort.Slice(services, func(i, j int) bool {
+		return sortorder.NaturalLess(services[i].Spec.Name, services[j].Spec.Name)
+	})
 	info := map[string]service.ListInfo{}
 	if !opts.Quiet {
 		taskFilter := filters.NewArgs()