beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change SCALE to REPLICAS.

Browse source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4df0349948)
This commit is contained in:
Daniel Nephin 2016-06-15 17:57:59 -04:00 committed by Tibor Vass
parent e324ec639b
commit 41d72e28c3
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/client/service/list.go
View file

@ -71,7 +71,7 @@ func printTable(out io.Writer, services []swarm.Service) {
// Ignore flushing errors // Ignore flushing errors
defer writer.Flush() defer writer.Flush()
fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "SCALE", "IMAGE", "COMMAND") fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "REPLICAS", "IMAGE", "COMMAND")
for _, service := range services { for _, service := range services {
scale := "" scale := ""
if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil { if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil {

2
api/client/service/scale.go
View file

@ -14,7 +14,7 @@ import (
func newScaleCommand(dockerCli *client.DockerCli) *cobra.Command { func newScaleCommand(dockerCli *client.DockerCli) *cobra.Command {
return &cobra.Command{ return &cobra.Command{
Use: "scale SERVICE=SCALE [SERVICE=SCALE...]", Use: "scale SERVICE=REPLICAS [SERVICE=REPLICAS...]",
Short: "Scale one or multiple services", Short: "Scale one or multiple services",
Args: scaleArgs, Args: scaleArgs,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {

4
docs/swarm/swarm-tutorial/deploy-service.md
View file

@ -39,8 +39,8 @@ example, the tutorial uses a machine named `manager1`.
``` ```
$ docker service ls $ docker service ls
ID NAME SCALE IMAGE COMMAND ID NAME REPLICAS IMAGE COMMAND
2zs4helqu64f helloworld 1 alpine ping docker.com 2zs4helqu64f helloworld 1 alpine ping docker.com
``` ```
## What's next? ## What's next?

2
experimental/docker-stacks.md
View file

@ -64,7 +64,7 @@ We can verify that services were correctly created:
```bash ```bash
# docker service ls # docker service ls
ID NAME SCALE IMAGE ID NAME REPLICAS IMAGE
COMMAND COMMAND
29bv0vnlm903 vossibility-stack_lookupd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqlookupd 29bv0vnlm903 vossibility-stack_lookupd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqlookupd
4awt47624qwh vossibility-stack_nsqd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqd --data-path=/data --lookupd-tcp-address=lookupd:4160 4awt47624qwh vossibility-stack_nsqd 1 nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662 /nsqd --data-path=/data --lookupd-tcp-address=lookupd:4160