Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2775 from thaJeztah/notabs 

Replace tab with spaces in usage output
This commit is contained in:
Tibor Vass 2020-10-22 12:40:42 -07:00 committed by GitHub
parent d1b4b61328 e6ef3349f6
commit 7fedb0e54f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cobra.go
View File

@ -296,8 +296,8 @@ func invalidPluginReason(cmd *cobra.Command) string {
var usageTemplate = `Usage: var usageTemplate = `Usage:
{{- if not .HasSubCommands}} {{.UseLine}}{{end}} {{- if not .HasSubCommands}} {{.UseLine}}{{end}}
{{- if .HasSubCommands}} {{ .CommandPath}}{{- if .HasAvailableFlags}} [OPTIONS]{{end}} COMMAND{{end}} {{- if .HasSubCommands}} {{ .CommandPath}}{{- if .HasAvailableFlags}} [OPTIONS]{{end}} COMMAND{{end}}
{{if ne .Long ""}}{{ .Long | trim }}{{ else }}{{ .Short | trim }}{{end}} {{if ne .Long ""}}{{ .Long | trim }}{{ else }}{{ .Short | trim }}{{end}}
{{- if isExperimental .}} {{- if isExperimental .}}

2
docs/reference/commandline/container_prune.md
View File

@ -7,7 +7,7 @@ keywords: container, prune, delete, remove
# container prune # container prune
```markdown ```markdown
Usage: docker container prune [OPTIONS] Usage: docker container prune [OPTIONS]
Remove all stopped containers Remove all stopped containers

2
docs/reference/commandline/image_prune.md
View File

@ -7,7 +7,7 @@ keywords: "image, prune, delete, remove"
# image prune # image prune
```markdown ```markdown
Usage: docker image prune [OPTIONS] Usage: docker image prune [OPTIONS]
Remove unused images Remove unused images

2
docs/reference/commandline/network_create.md
View File

@ -7,7 +7,7 @@ keywords: "network, create"
# network create # network create
```markdown ```markdown
Usage: docker network create [OPTIONS] NETWORK Usage: docker network create [OPTIONS] NETWORK
Create a network Create a network

2
docs/reference/commandline/network_prune.md
View File

@ -7,7 +7,7 @@ keywords: "network, prune, delete"
# network prune # network prune
```markdown ```markdown
Usage: docker network prune [OPTIONS] Usage: docker network prune [OPTIONS]
Remove all unused networks Remove all unused networks

2
docs/reference/commandline/node_rm.md
View File

@ -7,7 +7,7 @@ keywords: "node, remove"
# node rm # node rm
```markdown ```markdown
Usage: docker node rm [OPTIONS] NODE [NODE...] Usage: docker node rm [OPTIONS] NODE [NODE...]
Remove one or more nodes from the swarm Remove one or more nodes from the swarm

2
docs/reference/commandline/plugin_inspect.md
View File

@ -7,7 +7,7 @@ keywords: "plugin, inspect"
# plugin inspect # plugin inspect
```markdown ```markdown
Usage: docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...] Usage: docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...]
Display detailed information on one or more plugins Display detailed information on one or more plugins

2
docs/reference/commandline/plugin_push.md
View File

@ -5,7 +5,7 @@ keywords: "plugin, push"
--- ---
```markdown ```markdown
Usage: docker plugin push [OPTIONS] PLUGIN[:TAG] Usage: docker plugin push [OPTIONS] PLUGIN[:TAG]
Push a plugin to a registry Push a plugin to a registry

2
docs/reference/commandline/secret_create.md
View File

@ -7,7 +7,7 @@ keywords: ["secret, create"]
# secret create # secret create
```Markdown ```Markdown
Usage: docker secret create [OPTIONS] SECRET [file|-] Usage: docker secret create [OPTIONS] SECRET [file|-]
Create a secret from a file or STDIN as content Create a secret from a file or STDIN as content

2
docs/reference/commandline/secret_ls.md
View File

@ -7,7 +7,7 @@ keywords: ["secret, ls"]
# secret ls # secret ls
```Markdown ```Markdown
Usage: docker secret ls [OPTIONS] Usage: docker secret ls [OPTIONS]
List secrets List secrets

2
docs/reference/commandline/secret_rm.md
View File

@ -7,7 +7,7 @@ keywords: ["secret, rm"]
# secret rm # secret rm
```Markdown ```Markdown
Usage: docker secret rm SECRET [SECRET...] Usage: docker secret rm SECRET [SECRET...]
Remove one or more secrets Remove one or more secrets

2
docs/reference/commandline/service_ls.md
View File

@ -7,7 +7,7 @@ keywords: "service, ls"
# service ls # service ls
```Markdown ```Markdown
Usage: docker service ls [OPTIONS] Usage: docker service ls [OPTIONS]
List services List services

2
docs/reference/commandline/service_rm.md
View File

@ -7,7 +7,7 @@ keywords: "service, rm"
# service rm # service rm
```Markdown ```Markdown
Usage: docker service rm SERVICE [SERVICE...] Usage: docker service rm SERVICE [SERVICE...]
Remove one or more services Remove one or more services

2
docs/reference/commandline/service_rollback.md
View File

@ -7,7 +7,7 @@ keywords: "service, rollback"
# service rollback # service rollback
```markdown ```markdown
Usage: docker service rollback SERVICE Usage: docker service rollback SERVICE
Revert changes to a service's configuration Revert changes to a service's configuration

2
docs/reference/commandline/stack_ls.md
View File

@ -7,7 +7,7 @@ keywords: "stack, ls"
# stack ls # stack ls
```markdown ```markdown
Usage: docker stack ls [OPTIONS] Usage: docker stack ls [OPTIONS]
List stacks List stacks

2
docs/reference/commandline/stack_services.md
View File

@ -7,7 +7,7 @@ keywords: "stack, services"
# stack services # stack services
```markdown ```markdown
Usage: docker stack services [OPTIONS] STACK Usage: docker stack services [OPTIONS] STACK
List the services in the stack List the services in the stack

2
docs/reference/commandline/swarm_ca.md
View File

@ -7,7 +7,7 @@ keywords: "swarm, ca"
# swarm ca # swarm ca
```markdown ```markdown
Usage: docker swarm ca [OPTIONS] Usage: docker swarm ca [OPTIONS]
Manage root CA Manage root CA

2
docs/reference/commandline/swarm_join-token.md
View File

@ -7,7 +7,7 @@ keywords: "swarm, join-token"
# swarm join-token # swarm join-token
```markdown ```markdown
Usage: docker swarm join-token [OPTIONS] (worker|manager) Usage: docker swarm join-token [OPTIONS] (worker|manager)
Manage join tokens Manage join tokens

2
docs/reference/commandline/swarm_leave.md
View File

@ -7,7 +7,7 @@ keywords: "swarm, leave"
# swarm leave # swarm leave
```markdown ```markdown
Usage: docker swarm leave [OPTIONS] Usage: docker swarm leave [OPTIONS]
Leave the swarm Leave the swarm

2
docs/reference/commandline/swarm_unlock-key.md
View File

@ -7,7 +7,7 @@ keywords: "swarm, unlock-key"
# swarm unlock-key # swarm unlock-key
```markdown ```markdown
Usage: docker swarm unlock-key [OPTIONS] Usage: docker swarm unlock-key [OPTIONS]
Manage the unlock key Manage the unlock key

2
docs/reference/commandline/swarm_unlock.md
View File

@ -7,7 +7,7 @@ keywords: "swarm, unlock"
# swarm unlock # swarm unlock
```markdown ```markdown
Usage: docker swarm unlock Usage: docker swarm unlock
Unlock swarm Unlock swarm

2
docs/reference/commandline/system_df.md
View File

@ -7,7 +7,7 @@ keywords: "system, data, usage, disk"
# system df # system df
```markdown ```markdown
Usage: docker system df [OPTIONS] Usage: docker system df [OPTIONS]
Show docker filesystem usage Show docker filesystem usage

2
docs/reference/commandline/system_prune.md
View File

@ -7,7 +7,7 @@ keywords: "system, prune, delete, remove"
# system prune # system prune
```markdown ```markdown
Usage: docker system prune [OPTIONS] Usage: docker system prune [OPTIONS]
Remove unused data Remove unused data

2
docs/reference/commandline/trust_key_load.md
View File

@ -7,7 +7,7 @@ keywords: "key, notary, trust"
# trust key load # trust key load
```markdown ```markdown
Usage: docker trust key load [OPTIONS] KEYFILE Usage: docker trust key load [OPTIONS] KEYFILE
Load a private key file for signing Load a private key file for signing

2
docs/reference/commandline/trust_signer_add.md
View File

@ -7,7 +7,7 @@ keywords: "signer, notary, trust"
# trust signer add # trust signer add
```markdown ```markdown
Usage: docker trust signer add [OPTIONS] NAME REPOSITORY [REPOSITORY...] Usage: docker trust signer add [OPTIONS] NAME REPOSITORY [REPOSITORY...]
Add a signer Add a signer

2
docs/reference/commandline/trust_signer_remove.md
View File

@ -7,7 +7,7 @@ keywords: "signer, notary, trust"
# trust signer remove # trust signer remove
```markdown ```markdown
Usage: docker trust signer remove [OPTIONS] NAME REPOSITORY [REPOSITORY...] Usage: docker trust signer remove [OPTIONS] NAME REPOSITORY [REPOSITORY...]
Remove a signer Remove a signer

2
docs/reference/commandline/volume_prune.md
View File

@ -7,7 +7,7 @@ keywords: "volume, prune, delete"
# volume prune # volume prune
```markdown ```markdown
Usage: docker volume prune [OPTIONS] Usage: docker volume prune [OPTIONS]
Remove all unused local volumes Remove all unused local volumes

4
e2e/cli-plugins/run_test.go
View File

@ -49,7 +49,7 @@ func TestNonexistingHelp(t *testing.T) {
// This should actually be the whole docker help // This should actually be the whole docker help
// output, so spot check instead having of a golden // output, so spot check instead having of a golden
// with everything in, which will change too frequently. // with everything in, which will change too frequently.
Out: "Usage: docker [OPTIONS] COMMAND\n\nA self-sufficient runtime for containers", Out: "Usage: docker [OPTIONS] COMMAND\n\nA self-sufficient runtime for containers",
Err: icmd.None, Err: icmd.None,
}) })
// Short -h should be the same, modulo the deprecation message // Short -h should be the same, modulo the deprecation message
@ -101,7 +101,7 @@ func TestBadHelp(t *testing.T) {
// This should be literally the whole docker help // This should be literally the whole docker help
// output, so spot check instead of a golden with // output, so spot check instead of a golden with
// everything in which will change all the time. // everything in which will change all the time.
Out: "Usage: docker [OPTIONS] COMMAND\n\nA self-sufficient runtime for containers", Out: "Usage: docker [OPTIONS] COMMAND\n\nA self-sufficient runtime for containers",
Err: icmd.None, Err: icmd.None,
}) })
// Short -h should be the same, modulo the deprecation message // Short -h should be the same, modulo the deprecation message

2
e2e/cli-plugins/testdata/docker-help-helloworld-goodbye.golden vendored
View File

@ -1,4 +1,4 @@
Usage: docker helloworld goodbye Usage: docker helloworld goodbye
Say Goodbye instead of Hello Say Goodbye instead of Hello

2
e2e/cli-plugins/testdata/docker-help-helloworld.golden vendored
View File

@ -1,5 +1,5 @@
Usage: docker helloworld [OPTIONS] COMMAND Usage: docker helloworld [OPTIONS] COMMAND
A basic Hello World plugin for tests A basic Hello World plugin for tests

2
e2e/stack/testdata/stack-deploy-help-kubernetes.golden vendored
View File

@ -1,5 +1,5 @@
Usage: docker stack deploy [OPTIONS] STACK Usage: docker stack deploy [OPTIONS] STACK
Deploy a new stack or update an existing stack Deploy a new stack or update an existing stack

2
e2e/stack/testdata/stack-deploy-help-swarm.golden vendored
View File

@ -1,5 +1,5 @@
Usage: docker stack deploy [OPTIONS] STACK Usage: docker stack deploy [OPTIONS] STACK
Deploy a new stack or update an existing stack Deploy a new stack or update an existing stack