Commit Graph

1544 Commits

Author SHA1 Message Date
8a2bb174bf Soften limitation of update kernel memory
Kernel memory is not allowed to be updated if container is
running, it's not actually a precise kernel limitation.

Before kernel version 4.6, kernel memory will not be accounted
until kernel memory limit is set, if a container created with
kernel memory initialized, kernel memory is accounted as soon
as process created in container, so kernel memory limit update
is allowed afterward. If kernel memory is not initialized,
kernel memory consumed by processes in container will not be
accounted, so we can't update the limit because the account
will be wrong.

So update kernel memory of a running container with kernel memory
initialized is allowed, we should soften the limitation by docker.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 670a0b8077
Component: cli
2017-06-02 00:07:49 +00:00
b11bc7e580 Clarify warning against using build-time variables for secrets
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: e8b87f53ec
Component: cli
2017-06-02 00:07:49 +00:00
d2b9f8cb92 Fixes broken link in docs.
Fixes #24428

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
Upstream-commit: 46b571999d
Component: cli
2017-06-02 00:07:49 +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
9c6c426595 add constraint to service create ref
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: bf31e188d9
Component: cli
2017-06-02 00:07:49 +00:00
92dde977e4 add iptables=false to docs for multiple daemons
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 59e2c57540
Component: cli
2017-06-02 00:07:49 +00:00
177af81c48 Updates on cli reference documentation
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3ebe3fe752
Component: cli
2017-06-02 00:07:49 +00:00
29b9ce751d Generate a swarm joining secret if none is specified
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.

This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.

`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.

Closes #23785

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e632408a37
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
c75cd892f1 make docker service --help text for --endpoint-mode more consistent
Previously:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Now:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 20859b146b
Component: cli
2017-06-02 00:07:49 +00:00
166ef9b898 Change NAME to HOSTNAME in docs for docker node ls
In #24159, the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.

This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.

This fix is related to #24159 and #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cab7139a4b
Component: cli
2017-06-02 00:07:48 +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
8b04e31190 Merge pull request #24325 from Anvil/plugins_volume.md-unqiue
Fixed typo: s/unqiue/unique/g
(cherry picked from commit 84aa074d18d2f75f54564f21c2b5c0d1bcddd23f)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6abf924253
Component: cli
2017-06-02 00:07:48 +00:00
c92708906e Fix typo - stacks being managed, not tasks?
Upstream-commit: 1ba0a354fe
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
80567c7095 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 8e2c3efc58
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
273d3ff4f9 man: add missing --add-runtime
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fac7c67349
Component: cli
2017-06-02 00:07:48 +00:00
2138a28ca7 Fix typo
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
Upstream-commit: cbfebbb25a
Component: cli
2017-06-02 00:07:48 +00:00
9132e9d27a fix typo in "readonly" flag in documentation
the flag is named '--read-only', not '--readonly'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b4a798e983
Component: cli
2017-06-02 00:07:48 +00:00
688d1a439b Update network_create.md
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: bd67dfdd33
Component: cli
2017-06-02 00:07:47 +00:00
98d6b5e9ba Fix --auto-accept documentation
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ca0240f9c2
Component: cli
2017-06-02 00:07:47 +00:00
89a2975fe8 add menu.md, make index.md command line reference, update typos/minor errors in cli docs
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: a3b4cd7d99
Component: cli
2017-06-02 00:07:47 +00:00
138f629d25 rename desired_state filter to desired-state
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b9505045d9
Component: cli
2017-06-02 00:07:47 +00:00
e37780149a [Docs] clarified local volume driver docs
Signed-off-by: Nico <nicolaka@gmail.com>
Upstream-commit: f68b707d60
Component: cli
2017-06-02 00:07:47 +00:00
f9d84ba5b2 Add documentation for external CA features in API/CLI
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4721039d71
Component: cli
2017-06-02 00:07:47 +00:00
fde6d2f8c2 Fix docker stack link
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: a450d9a474
Component: cli
2017-06-02 00:07:47 +00:00
d9e279a919 Added HPE volume plugin listing
Signed-off-by: Keith Hudgins <greenman@greenman.org>
Upstream-commit: 2b0ee276ca
Component: cli
2017-06-02 00:07:47 +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
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