Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2028 from pszczekutowicz/master 

Sort list of services from swarm stacks using natural sorting
This commit is contained in:
Silvin Lubecki 2019-09-05 11:47:58 +02:00 committed by GitHub
parent 07da88c6cd 34447852b5
commit 7aa764bba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cli/command/stack/swarm/services.go
View File

@ -3,6 +3,7 @@ package swarm
import ( import (
"context" "context"
"fmt" "fmt"
"sort"
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/service" "github.com/docker/cli/cli/command/service"
@ -10,6 +11,7 @@ import (
"github.com/docker/cli/cli/command/stack/options" "github.com/docker/cli/cli/command/stack/options"
"github.com/docker/docker/api/types" "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"vbom.ml/util/sortorder"
) )
// RunServices is the swarm implementation of docker stack services // RunServices is the swarm implementation of docker stack services
@ -29,6 +31,9 @@ func RunServices(dockerCli command.Cli, opts options.Services) error {
return nil 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{} info := map[string]service.ListInfo{}
if !opts.Quiet { if !opts.Quiet {
taskFilter := filters.NewArgs() taskFilter := filters.NewArgs()