be14edca2a
This code was updated in 7b9580df518bd0c3c859279d7423872625404f6b, which
removed support for using kubernetes as orchestrator, but in doing so
made this `sort.Slice` (probably) not do what it was expected to do ':)
index 412cc2e5ee86..861ae1be2fb9 100644
@@ -75,8 +54,7 @@ func format(dockerCli command.Cli, opts options.List, orchestrator command.Orche
}
sort.Slice(stacks, func(i, j int) bool {
return sortorder.NaturalLess(stacks[i].Name, stacks[j].Name) ||
- !sortorder.NaturalLess(stacks[j].Name, stacks[i].Name) &&
- sortorder.NaturalLess(stacks[j].Namespace, stacks[i].Namespace)
+ !sortorder.NaturalLess(stacks[j].Name, stacks[i].Name)
})
return formatter.StackWrite(stackCtx, stacks)
}
The extra condition was added in 84241cc393a36848076c2d3bd61fa023858fb16b
to support multiple namespaces. This patch removes it, bringing it back to
the state it was before that commit.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
63 lines
1.7 KiB
Go
63 lines
1.7 KiB
Go
package stack
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
"sort"
|
|
|
|
"github.com/docker/cli/cli"
|
|
"github.com/docker/cli/cli/command"
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/cli/cli/command/stack/formatter"
|
|
"github.com/docker/cli/cli/command/stack/options"
|
|
"github.com/docker/cli/cli/command/stack/swarm"
|
|
flagsHelper "github.com/docker/cli/cli/flags"
|
|
"github.com/fvbommel/sortorder"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func newListCommand(dockerCli command.Cli) *cobra.Command {
|
|
opts := options.List{}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "ls [OPTIONS]",
|
|
Aliases: []string{"list"},
|
|
Short: "List stacks",
|
|
Args: cli.NoArgs,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
return RunList(cmd.Context(), dockerCli, opts)
|
|
},
|
|
ValidArgsFunction: completion.NoComplete,
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
flags.StringVar(&opts.Format, "format", "", flagsHelper.FormatHelp)
|
|
return cmd
|
|
}
|
|
|
|
// RunList performs a stack list against the specified swarm cluster
|
|
func RunList(ctx context.Context, dockerCli command.Cli, opts options.List) error {
|
|
ss, err := swarm.GetStacks(ctx, dockerCli.Client())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
stacks := make([]*formatter.Stack, 0, len(ss))
|
|
stacks = append(stacks, ss...)
|
|
return format(dockerCli.Out(), opts, stacks)
|
|
}
|
|
|
|
func format(out io.Writer, opts options.List, stacks []*formatter.Stack) error {
|
|
fmt := formatter.Format(opts.Format)
|
|
if fmt == "" || fmt == formatter.TableFormatKey {
|
|
fmt = formatter.SwarmStackTableFormat
|
|
}
|
|
stackCtx := formatter.Context{
|
|
Output: out,
|
|
Format: fmt,
|
|
}
|
|
sort.Slice(stacks, func(i, j int) bool {
|
|
return sortorder.NaturalLess(stacks[i].Name, stacks[j].Name)
|
|
})
|
|
return formatter.StackWrite(stackCtx, stacks)
|
|
}
|