Commit Graph

385 Commits

Author SHA1 Message Date
a677374f33 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2f9e9bcbaa
Component: cli
2017-06-02 00:10:02 +00:00
de76192c9e remove "secrets" from completion scripts
Swarm join has been changed in f5e1f6f6880391a5a3399023cf93a3c48502e57d,
removing various options and the "node accept" command.

This removes the removed options from the completion
scripts.

NOTE: a new command ("docker swarm join-token") was
also added, but is not part of this commit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6eef41333d
Component: cli
2017-06-02 00:10:02 +00:00
e128f0ccd5 Replace secrets with join tokens
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: acf0bc4b9a
Component: cli
2017-06-02 00:10:02 +00:00
0ef7be695f Add manual support for macvlan networks to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6218da47b1
Component: cli
2017-06-02 00:10:01 +00:00
0c50f823f7 Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1f0b0b007c
Component: cli
2017-06-02 00:10:01 +00:00
09d64ed0cb Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f2e01edf57
Component: cli
2017-06-02 00:10:01 +00:00
bbf1c30986 Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ddd049d51a
Component: cli
2017-06-02 00:10:01 +00:00
87d34bb5c1 bash completion for docker node update --label-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 56491f1caa
Component: cli
2017-06-02 00:07:51 +00:00
09c5057193 bash completion for docker service {create,update} --log-{driver,opt}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cbaa143737
Component: cli
2017-06-02 00:07:51 +00:00
c6248ce73e Improve flag help consistency, and update docs
This adds the `--live-restore` option to the documentation.

Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 77e4100d00
Component: cli
2017-06-02 00:07:51 +00:00
e7aaba73d9 Small zsh completion fix on --pretty & --no-resolve
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1ca03e4fd9
Component: cli
2017-06-02 00:07:51 +00:00
1b3cd7e680 Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fdfa9befed
Component: cli
2017-06-02 00:07:51 +00:00
2a4a489b0c Add zsh completion for 'dockerd --oom-score-adjust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 3ce44d633a
Component: cli
2017-06-02 00:07:51 +00:00
771c319a28 Add zsh completion for 'docker service {create,update} --registry-auth'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0a6f1be9ce
Component: cli
2017-06-02 00:07:51 +00:00
ac7474cbb7 Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dc7c008c08
Component: cli
2017-06-02 00:07:51 +00:00
a32637bf7a bash completion for docker daemon --oom-score-adjust
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 94092e24a7
Component: cli
2017-06-02 00:07:50 +00:00
857bcf3a13 Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c33bc7d99e
Component: cli
2017-06-02 00:07:50 +00:00
34f04d67ef Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2e844f5e8d
Component: cli
2017-06-02 00:07:50 +00:00
8070cdebc7 Change bash completion for docker run --net* to --network*
Ref: https://github.com/docker/docker/pull/23324

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5ad5dc4baf
Component: cli
2017-06-02 00:07:50 +00:00
e8780adb60 Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a94dee25fc
Component: cli
2017-06-02 00:07:50 +00:00
26674d9fa1 bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2364392ded
Component: cli
2017-06-02 00:07:50 +00:00
1faecfc45b bash completion for default port on docker swarm {init,join}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2082c976e8
Component: cli
2017-06-02 00:07:49 +00:00
a3109e1623 bash completion can be configured to show node and service IDs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 14f578eb92
Component: cli
2017-06-02 00:07:49 +00:00
a0a4ff54be bash completion for docker {service,node} filters
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e417618387
Component: cli
2017-06-02 00:07:49 +00:00
ad92fbb392 Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de7c6a8355
Component: cli
2017-06-02 00:07:49 +00:00
22c3d30a71 Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
Upstream-commit: 06683c5ea3
Component: cli
2017-06-02 00:07:48 +00:00
afdbe8b1ee Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c51671ccb9
Component: cli
2017-06-02 00:07:48 +00:00
ef137b399e Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 649b3e132d
Component: cli
2017-06-02 00:07:48 +00:00
4c8314bbbb Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b1ea724ae6
Component: cli
2017-06-02 00:07:48 +00:00
e92a7c1e2b Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e31b0e691a
Component: cli
2017-06-02 00:07:48 +00:00
9e622cd658 Add zsh completion for 'docker node' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 825b9a3b33
Component: cli
2017-06-02 00:07:48 +00:00
e848d54c14 Add zsh completion for 'docker ps --last'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0f61955bdb
Component: cli
2017-06-02 00:07:48 +00:00
1eabd2ce29 Add bash completion for docker ps --last
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec37a0b192
Component: cli
2017-06-02 00:07:48 +00:00
7844efa404 make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a03b5522fe
Component: cli
2017-06-02 00:07:47 +00:00
abc7ff0935 bash completion enhancements for docker {swarm,node,service}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 29be1f50a8
Component: cli
2017-06-02 00:07:47 +00:00
8dfa9d87a0 Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 154a1c1206
Component: cli
2017-06-02 00:07:46 +00:00
6c337e407d Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6e1e11e0e3
Component: cli
2017-06-02 00:07:46 +00:00
9f57c59ee3 Add zsh completion for 'docker run --storage-opt size='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1216831bc6
Component: cli
2017-06-02 00:07:46 +00:00
2174cfdc52 Re-Add zsh completion for '-c' alias to '--cpu-shares'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 993d8f6dd4
Component: cli
2017-06-02 00:07:46 +00:00
1d425a2df6 Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 95342189ab
Component: cli
2017-06-02 00:07:46 +00:00
ff6579771a bash completion for -c alias to --cpu-shares
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6440bac134
Component: cli
2017-06-02 00:07:46 +00:00
109a5706ac bash completion for docker daemon --storage-opt btrfs.min_space
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6f3d828938
Component: cli
2017-06-02 00:07:46 +00:00
957417db6e bash completion for docker {run,create} --storage-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 789cd4c65f
Component: cli
2017-06-02 00:07:46 +00:00
f20586b7a2 bash completion for load and save image events
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1ffefe059f
Component: cli
2017-06-02 00:07:46 +00:00
97a0906af9 bash completion for docker daemon --storage-driver olverlay2
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 884c0bab27
Component: cli
2017-06-02 00:07:46 +00:00
405f0797de bash completion for docker {run,create,network connect} --link-local-ip
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ef5f8ec503
Component: cli
2017-06-02 00:07:46 +00:00
0d58aaf904 Add zsh completion for 'docker daemon --live-restore'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5846f66bf2
Component: cli
2017-06-02 00:07:46 +00:00
d579c11d35 fix bash completion for docker {swarm,node} subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ab24ffa000
Component: cli
2017-06-02 00:07:45 +00:00
c173ea89a5 correct sort order in new bash completions
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 53e1898a90
Component: cli
2017-06-02 00:07:45 +00:00
e1cff7efc8 Add bash completion for docker service scale
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
Upstream-commit: ec3864b028
Component: cli
2017-06-02 00:07:45 +00:00