mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
f8c7c921d9
This fix tries to address the issue raised in 27189 where it is not possible to support configured formatting stored in config.json. Since `--format` was not supported in `docker service ps`, the flag `--format` has also been added in this fix. This fix 1. Add `--format` to `docker service ps` 2. Add `tasksFormat` to config.json 3. Add `--format` to `docker stack ps` 4. Add `--format` to `docker node ps` The related docs has been updated. An integration test has been added. This fix fixes 27189. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
76 lines
2 KiB
Go
76 lines
2 KiB
Go
package stack
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/docker/cli/command"
|
|
"github.com/docker/docker/cli/command/formatter"
|
|
"github.com/docker/docker/cli/command/idresolver"
|
|
"github.com/docker/docker/cli/command/task"
|
|
"github.com/docker/docker/opts"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type psOptions struct {
|
|
filter opts.FilterOpt
|
|
noTrunc bool
|
|
namespace string
|
|
noResolve bool
|
|
quiet bool
|
|
format string
|
|
}
|
|
|
|
func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
|
|
opts := psOptions{filter: opts.NewFilterOpt()}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "ps [OPTIONS] STACK",
|
|
Short: "List the tasks in the stack",
|
|
Args: cli.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.namespace = args[0]
|
|
return runPS(dockerCli, opts)
|
|
},
|
|
}
|
|
flags := cmd.Flags()
|
|
flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
|
|
flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
|
|
flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
|
|
flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display task IDs")
|
|
flags.StringVar(&opts.format, "format", "", "Pretty-print tasks using a Go template")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runPS(dockerCli *command.DockerCli, opts psOptions) error {
|
|
namespace := opts.namespace
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
|
|
filter := getStackFilterFromOpt(opts.namespace, opts.filter)
|
|
|
|
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(tasks) == 0 {
|
|
fmt.Fprintf(dockerCli.Out(), "Nothing found in stack: %s\n", namespace)
|
|
return nil
|
|
}
|
|
|
|
format := opts.format
|
|
if len(format) == 0 {
|
|
if len(dockerCli.ConfigFile().TasksFormat) > 0 && !opts.quiet {
|
|
format = dockerCli.ConfigFile().TasksFormat
|
|
} else {
|
|
format = formatter.TableFormatKey
|
|
}
|
|
}
|
|
|
|
return task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format)
|
|
}
|