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>
107 lines
2.6 KiB
Go
107 lines
2.6 KiB
Go
package node
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"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"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
type psOptions struct {
|
|
nodeIDs []string
|
|
noResolve bool
|
|
noTrunc bool
|
|
quiet bool
|
|
format string
|
|
filter opts.FilterOpt
|
|
}
|
|
|
|
func newPsCommand(dockerCli command.Cli) *cobra.Command {
|
|
opts := psOptions{filter: opts.NewFilterOpt()}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "ps [OPTIONS] [NODE...]",
|
|
Short: "List tasks running on one or more nodes, defaults to current node",
|
|
Args: cli.RequiresMinArgs(0),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.nodeIDs = []string{"self"}
|
|
|
|
if len(args) != 0 {
|
|
opts.nodeIDs = args
|
|
}
|
|
|
|
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.StringVar(&opts.format, "format", "", "Pretty-print tasks using a Go template")
|
|
flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display task IDs")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runPs(dockerCli command.Cli, opts psOptions) error {
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
|
|
var (
|
|
errs []string
|
|
tasks []swarm.Task
|
|
)
|
|
|
|
for _, nodeID := range opts.nodeIDs {
|
|
nodeRef, err := Reference(ctx, client, nodeID)
|
|
if err != nil {
|
|
errs = append(errs, err.Error())
|
|
continue
|
|
}
|
|
|
|
node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
|
|
if err != nil {
|
|
errs = append(errs, err.Error())
|
|
continue
|
|
}
|
|
|
|
filter := opts.filter.Value()
|
|
filter.Add("node", node.ID)
|
|
|
|
nodeTasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
|
|
if err != nil {
|
|
errs = append(errs, err.Error())
|
|
continue
|
|
}
|
|
|
|
tasks = append(tasks, nodeTasks...)
|
|
}
|
|
|
|
format := opts.format
|
|
if len(format) == 0 {
|
|
if dockerCli.ConfigFile() != nil && len(dockerCli.ConfigFile().TasksFormat) > 0 && !opts.quiet {
|
|
format = dockerCli.ConfigFile().TasksFormat
|
|
} else {
|
|
format = formatter.TableFormatKey
|
|
}
|
|
}
|
|
|
|
if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format); err != nil {
|
|
errs = append(errs, err.Error())
|
|
}
|
|
|
|
if len(errs) > 0 {
|
|
return fmt.Errorf("%s", strings.Join(errs, "\n"))
|
|
}
|
|
|
|
return nil
|
|
}
|