Commit Graph

548 Commits

Author SHA1 Message Date
Vincent Demeester cc651bc642
Update service inspect --pretty reference docs
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-14 11:23:03 +02:00
Vincent Demeester dbe310eff0
Update service update commandline reference docs
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-14 11:22:18 +02:00
Aaron Lehmann 6de8fcb2f2 Use spaces, not tabs, to format sample "swarm join" command
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-13 19:31:05 -06:00
Tibor Vass 1f74917f60 Merge pull request #24591 from thaJeztah/remove-shorthand-flagz
Remove shorthand flags for "mount", "pretty", and "no-resolve"
2016-07-13 12:51:53 -07:00
Arnaud Porterie ef322a3fbb Merge pull request #24516 from crosbymichael/oom-score
Add --oom-score-adjust to daemon
2016-07-13 18:39:30 +00:00
Sebastiaan van Stijn 7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie 58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Vincent Demeester e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Vincent Demeester 92b1577871 Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
2016-07-13 15:13:58 +02:00
Mei ChunTao acbe38a3cc fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
2016-07-13 08:21:26 +08:00
Sebastiaan van Stijn ea365e4cb3
Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 01:08:54 +02:00
Michael Crosby a894aec8d8 Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-12 15:53:15 -07:00
Tibor Vass 778b38cbf1 Merge pull request #23324 from icecrime/add_run_network
Add run network
2016-07-12 14:59:48 -07:00
Sebastiaan van Stijn 06517753c1
Add "auto-accept=none" to documentation
The "none" option was not added to the documentation.
This adds an example, and adds additional information
on manually accepting or rejecting a node.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 22:06:01 +02:00
Arnaud Porterie (icecrime) c0c7d5e715
Rename `--net` to `--network`
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.

Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-07-12 13:01:35 -07:00
Sebastiaan van Stijn a44f010702 Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
2016-07-12 19:22:27 +02:00
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
Derek McGowan ff98da0607 Allow option to override kernel check in overlay2
Add option to skip kernel check for older kernels which have been patched to support multiple lower directories in overlayfs.

Fixes #24023

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-11 16:48:08 -07: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