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)
49 lines
1.2 KiB
Go
49 lines
1.2 KiB
Go
package node
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/docker/docker/api/client"
|
|
"github.com/docker/docker/cli"
|
|
apiclient "github.com/docker/engine-api/client"
|
|
)
|
|
|
|
// NewNodeCommand returns a cobra command for `node` subcommands
|
|
func NewNodeCommand(dockerCli *client.DockerCli) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "node",
|
|
Short: "Manage Docker Swarm nodes",
|
|
Args: cli.NoArgs,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
fmt.Fprintf(dockerCli.Err(), "\n"+cmd.UsageString())
|
|
},
|
|
}
|
|
cmd.AddCommand(
|
|
newDemoteCommand(dockerCli),
|
|
newInspectCommand(dockerCli),
|
|
newListCommand(dockerCli),
|
|
newPromoteCommand(dockerCli),
|
|
newRemoveCommand(dockerCli),
|
|
newPSCommand(dockerCli),
|
|
newUpdateCommand(dockerCli),
|
|
)
|
|
return cmd
|
|
}
|
|
|
|
// Reference returns the reference of a node. The special value "self" for a node
|
|
// reference is mapped to the current node, hence the node ID is retrieved using
|
|
// the `/info` endpoint.
|
|
func Reference(client apiclient.APIClient, ctx context.Context, ref string) (string, error) {
|
|
if ref == "self" {
|
|
info, err := client.Info(ctx)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return info.Swarm.NodeID, nil
|
|
}
|
|
return ref, nil
|
|
}
|