Commit Graph

1508 Commits

Author SHA1 Message Date
7616636626 add documentation for desired_state filter
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 77d6b3721e
Component: cli
2017-06-02 00:07:47 +00:00
98fc0d4ccc deprecate '-h' shorthand and remove '-help'
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.

This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead21e6ab9eafcb1b1d2437c725c43a06a), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5f58bbfff3
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
19fb36b794 uppercase output in node inspect to keep consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a9fcf23fb9
Component: cli
2017-06-02 00:07:47 +00:00
fabfed0c85 Update experimental docs dsb -> dab
Fixing bundle extension in experimental documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e5d2d7c310
Component: cli
2017-06-02 00:07:47 +00:00
6090ee85ed update go-md2man to v1.0.5
Due to the issue of go-md2man, a numbered list in `man docker login` was not rendered correctly.
a8f937e113

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: e483efc219
Component: cli
2017-06-02 00:07:47 +00:00
12701ff2ab Fix error for env variables example in docker reference - 2
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.

When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe24b4c8e931f751979b5e69e20ba77e2, except only for one occurrence.

Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
Upstream-commit: beb09f42d6
Component: cli
2017-06-02 00:07:47 +00:00
d33b8a046a Removing some url links that can be resolved using src markdown links
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: be6f353670
Component: cli
2017-06-02 00:07:46 +00:00
9c9004d65c For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
Upstream-commit: d2f61188f1
Component: cli
2017-06-02 00:07:46 +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
18548c6d83 Man page fix: Mention supported drivers for --storage-opt size option in docker create/run
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 43e6c9864b
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
96750effa4 Added daemon.json Windows example
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
Upstream-commit: 32054251c7
Component: cli
2017-06-02 00:07:46 +00:00
3abf4d85b1 PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 94b45e398f
Component: cli
2017-06-02 00:07:45 +00:00
50e82af126 update docker swarm cli
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 87591ae9b7
Component: cli
2017-06-02 00:07:45 +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
5357e9b84b Add the advisory=rc metadata
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: b6bfe363f8
Component: cli
2017-06-02 00:07:45 +00:00
16d2ae21bb remove "RC" warning from Markdown files
A site-wide banner is going to be used, so we don't need this warning

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7b22dbd02a
Component: cli
2017-06-02 00:07:45 +00:00
84f2049f6b Fix markdown formatting for experimental
- don't indent code-blocks that use fences
- fixed some formatting
- wrapped long lines to 80-chars
- removed stray empty lines

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e80065ae37
Component: cli
2017-06-02 00:07:45 +00:00
62550cf790 bring dab into title and intro
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 2f835a732d
Component: cli
2017-06-02 00:07:45 +00:00
43cc7b42e9 expand stack doc
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 635ab02ea6
Component: cli
2017-06-02 00:07:45 +00:00
ce9099a5fe Add release tag reference links in deprecated.md
This fix adds a couple of missed release tag reference links in deprecated.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55f5fd6902
Component: cli
2017-06-02 00:07:45 +00:00
3196139f55 Update help output to match Docker 1.11.
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: def6847e11
Component: cli
2017-06-02 00:07:45 +00:00
d2844bb5d6 fix bash completion for docker service subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 603002a3ec
Component: cli
2017-06-02 00:07:45 +00:00
d57b7662f3 Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 03c9762fba
Component: cli
2017-06-02 00:07:45 +00:00
37fef65db7 fix #23017, add zsh completion for dockerd
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
Upstream-commit: 903d9013a3
Component: cli
2017-06-02 00:07:45 +00:00
b1ce0d7bfe bash completion for docker swarm update --cert-expiry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6cc83d80e0
Component: cli
2017-06-02 00:07:44 +00:00
04ba85430e update output for node commands, minor edits
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: a816f63e57
Component: cli
2017-06-02 00:07:44 +00:00
51b169e361 Add cert-expiry to swarm update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 308888a8c6
Component: cli
2017-06-02 00:07:44 +00:00
792e5c1370 Update docker info output example
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 541dcf39ad
Component: cli
2017-06-02 00:07:44 +00:00
2155651b3d docs: move "advisory" to general metadata
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bfbf538f68
Component: cli
2017-06-02 00:07:44 +00:00
71e40259e9 Change SCALE to REPLICAS.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7766083eb8
Component: cli
2017-06-02 00:07:44 +00:00
9f6f305b0e Update experimental/README.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 4d7ce3559f
Component: cli
2017-06-02 00:07:44 +00:00
8ba9627310 Make --dispatcher-heartbeat-period a duration
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 96150d3faa
Component: cli
2017-06-02 00:07:44 +00:00
3feb513b7e Add experimental documentation for stacks
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 49023a1c5f
Component: cli
2017-06-02 00:07:44 +00:00
79a261a81e no more 'docker node reject' in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d8fee0b06e
Component: cli
2017-06-02 00:07:44 +00:00
3bc24bacb3 docker plugin commandline reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c1739b80d
Component: cli
2017-06-02 00:07:44 +00:00
17421ce296 Update bash completion for Docker 1.12 CLI commands
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
Upstream-commit: ec66559999
Component: cli
2017-06-02 00:07:44 +00:00