0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
25654 commits 14 branches 412 tags 338 MiB
Commit graph

531 commits

Author SHA1 Message Date
Sebastiaan van Stijn
7da11b1afd Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept 
Add comma-separated --auto-accept support.
 2016-07-12 16:29:21 +02:00
Qiang Huang
08c7075c40 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>
 2016-07-12 08:07:24 +08:00
johnharris85
8e14882773 Add support for comma-separated --auto-accept syntax. 
Signed-off-by: John Harris <john@johnharris.io>
 2016-07-11 15:47:04 -07:00
Sebastiaan van Stijn
63186c06cb Merge pull request #24432 from sfsmithcha/doc_service_constraint 
add constraint to service create ref
 2016-07-07 21:06:50 -07:00
Tibor Vass
bd37b83052 Merge pull request #24426 from thaJeztah/add-iptables-to-multi-daemon-docs 
add iptables=false to docs for multiple daemons
 2016-07-07 18:50:45 -07:00
Charles Smith
093817031a add constraint to service create ref 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-07 18:25:37 -07:00
Sebastiaan van Stijn
1255e53e28
add iptables=false to docs for multiple daemons 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-07 14:54:44 -07:00
Sebastiaan van Stijn
b98ba9a1d6 Merge pull request #24291 from vdemeester/docs-cli-reference-updates 
Updates on cli reference documentation
 2016-07-07 14:28:54 -07:00
Vincent Demeester
f4cfc6b983
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>
 2016-07-07 20:43:18 +02:00
Tõnis Tiigi
db67db98d8 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default 
Generate a swarm joining secret if none is specified
 2016-07-07 11:43:08 -07:00
Vincent Demeester
a859a33647
Use "on-failure" for both containers and services 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-07 11:32:19 +02:00
Sebastiaan van Stijn
f85a231c5f Merge pull request #24330 from avsm/endpoint-cli-typo 
make `docker service --help` text for `--endpoint-mode` more consistent
 2016-07-07 00:24:03 -07:00
Yong Tang
668b8a998f 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>
 2016-07-06 20:23:53 -07:00
Aaron Lehmann
7342e42fce 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>
 2016-07-06 13:04:50 -07:00
Anil Madhavapeddy
2de9585f5e 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>
 2016-07-06 12:10:28 +01:00
Vincent Demeester
1763474a84 Merge pull request #24287 from ottok/fix-spelling 
Fix spelling in comments, strings and documentation
 2016-07-03 22:34:00 +02:00
Otto Kekäläinen
644a7426cc Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
 2016-07-03 20:58:11 +03:00
Sebastiaan van Stijn
afce0f5946 Merge pull request #24264 from runcom/mandokerd8 
man: add missing --add-runtime
 2016-07-03 10:13:28 -07:00
Adolfo Ochagavía
76b09be696 Fix typo 
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
 2016-07-03 15:20:27 +02:00
Antonio Murdaca
585332dfe0 man: add missing --add-runtime 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-07-03 11:57:44 +02:00
Sebastiaan van Stijn
3b6bd66cc9 Merge pull request #24251 from thaJeztah/fix-readonly-flag 
fix typo in "readonly" flag in documentation
 2016-07-02 08:38:16 -07:00
Vincent Demeester
5347536631 Merge pull request #24245 from cloojure/patch-4 
Update network_create.md
 2016-07-02 11:32:40 +02:00
Sebastiaan van Stijn
ac12696ff4
fix typo in "readonly" flag in documentation 
the flag is named '--read-only', not '--readonly'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-01 17:08:59 -07:00
Aaron Lehmann
9aed7d1a3d 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>
 2016-07-01 16:54:30 -07:00
Alan Thompson
68b8cc9735 Update network_create.md 
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-07-01 16:16:53 -07:00
Sebastiaan van Stijn
691bbeaf44 Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu 
add menu.md, make index.md command line reference, update typos/minor…
 2016-07-01 10:00:54 -07:00
Vincent Demeester
b898882461 Merge pull request #24128 from thaJeztah/rename-desired_state-filter 
rename desired_state filter to desired-state
 2016-07-01 18:34:02 +02:00
Vincent Demeester
75923481d7 Merge pull request #24179 from nicolaka/master 
[Docs] added nfs docs
 2016-07-01 12:38:57 +02:00
Aaron Lehmann
fa147591ed Add documentation for external CA features in API/CLI 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-06-30 18:08:57 -07:00
Sebastiaan van Stijn
d761719eb4 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>
 2016-06-30 14:49:46 -07:00
Charles Smith
f98f596c19 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>
 2016-06-30 14:30:11 -07:00
Nicola Kabar
841f985994 [Docs] clarified local volume driver docs 
Signed-off-by: Nico <nicolaka@gmail.com>
 2016-06-30 14:15:44 -07:00
allencloud
184afb92bf make cmd short short consistency and change docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-30 21:17:51 +08:00
Harald Albers
36f57f7d02 add documentation for desired_state filter 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-29 08:27:25 -07:00
allencloud
89582e1a34 uppercase output in node inspect to keep consistency 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-27 18:29:27 +08:00
orkaa
1bdbfa5770 For the lulz! (evalulate -> evaluate) 
Signed-off-by: orkaa <orkica@gmail.com>
 2016-06-23 16:26:43 +02:00
Sven Dowideit
d82e82a827 Merge pull request #23657 from neilpeterson/nepeters-docs-configfile 
Added daemon.json Windows example
 2016-06-21 21:07:19 +10:00
Shishir Mahajan
fe6416d04f 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>
 2016-06-20 22:27:02 -04:00
Vincent Demeester
bfff4cce67 Merge pull request #23696 from sfsmithcha/check_swarm_cli 
update docker swarm cli
 2016-06-20 15:40:06 +02:00
Sven Dowideit
daedbc60d6 Add the advisory=rc metadata 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-20 11:54:53 +00:00
Sebastiaan van Stijn
37ee14a998
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>
 2016-06-20 00:24:37 -07:00
Charles Chan
17ae6539f6 Update help output to match Docker 1.11. 
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2016-06-18 13:47:12 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-17 17:28:24 -07:00
Charles Smith
78ebfaff1a update docker swarm cli 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-17 15:40:43 -07:00
Charles Smith
3b2132c2c7 update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-16 21:44:07 -07:00
Neil Peterson
8352089e8c Added daemon.json Windows example 
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
 2016-06-16 21:41:58 -07:00
Arnaud Porterie
f52c807650 Merge pull request #23651 from tonistiigi/cert-expiry 
Add cert-expiry to swarm update
 2016-06-17 02:50:58 +00:00
Tonis Tiigi
7d8d51aa9d Add cert-expiry to swarm update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 18:06:02 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 16:29:23 -07:00
Sebastiaan van Stijn
aadd88c306
docs: move "advisory" to general metadata 
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 11:52:34 -07:00