mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
2f736927a0
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.
This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.
The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:
```
$ docker service ps condescending_cori
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 13 minutes ago Running 6c6d232a5d0e
```
The following shows the output for the node on which the command is
running:
```console
$ docker node ps self
ID NAME SERVICE IMAGE LAST STATE DESIRED STATE NODE
b1tpbi43k1ibevg2e94bmqo0s mad_kalam.1 mad_kalam apline Accepted 2 seconds ago Accepted 6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2 condescending_cori.1 condescending_cori alpine Running 12 minutes ago Running 6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5 furious_davinci.1 furious_davinci redis Running 32 minutes ago Running 6c6d232a5d0e
```
Signed-off-by: Stephen J Day <stephen.day@docker.com>
(cherry picked from commit 0aa4e1e689)
63 lines
1.5 KiB
Go
63 lines
1.5 KiB
Go
package node
|
|
|
|
import (
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/client"
|
|
"github.com/docker/docker/api/client/idresolver"
|
|
"github.com/docker/docker/api/client/task"
|
|
"github.com/docker/docker/cli"
|
|
"github.com/docker/docker/opts"
|
|
"github.com/docker/engine-api/types"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type psOptions struct {
|
|
nodeID string
|
|
noResolve bool
|
|
filter opts.FilterOpt
|
|
}
|
|
|
|
func newPSCommand(dockerCli *client.DockerCli) *cobra.Command {
|
|
opts := psOptions{filter: opts.NewFilterOpt()}
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "ps [OPTIONS] self|NODE",
|
|
Short: "List tasks running on a node",
|
|
Args: cli.ExactArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.nodeID = args[0]
|
|
return runPS(dockerCli, opts)
|
|
},
|
|
}
|
|
flags := cmd.Flags()
|
|
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")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runPS(dockerCli *client.DockerCli, opts psOptions) error {
|
|
client := dockerCli.Client()
|
|
ctx := context.Background()
|
|
|
|
nodeRef, err := Reference(client, ctx, opts.nodeID)
|
|
if err != nil {
|
|
return nil
|
|
}
|
|
node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
filter := opts.filter.Value()
|
|
filter.Add("node", node.ID)
|
|
tasks, err := client.TaskList(
|
|
ctx,
|
|
types.TaskListOptions{Filter: filter})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve))
|
|
}
|