Commit Graph

978 Commits

Author SHA1 Message Date
9b4a3ab43b Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
Upstream-commit: a44f0107023aa62d202b068c0a8d4b5ad0640838
Component: engine
2016-07-12 19:22:27 +02:00
36cae188de Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
Add comma-separated --auto-accept support.
Upstream-commit: 7da11b1afda5f42d07b7304a7edcd1886434d9ed
Component: engine
2016-07-12 16:29:21 +02:00
048f3b1b85 Merge pull request #24504 from hqhq/soften_update_kmem
Soften limitation of update kernel memory
Upstream-commit: 110b2aecda9625dd5679733686d1cc169f87a463
Component: engine
2016-07-12 13:58:17 +02:00
9910f511b8 Merge pull request #24519 from thaJeztah/add-pidmode-api-docs
Add missing API docs for HostConfig.PidMode
Upstream-commit: c7b283bbe3df5fe7a13340deab44d52a5a40ad5e
Component: engine
2016-07-12 12:31:58 +02:00
fb15fd3401 Clarify warning against using build-time variables for secrets
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: 9af24ba3ac9c2efbb8ec7edef4668650a3c31834
Component: engine
2016-07-11 21:21:33 -04:00
1a97e07ac0 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: 08c7075c403b86111b2c393b49075a81a1d2263f
Component: engine
2016-07-12 08:07:24 +08:00
32cd0213a9 Add missing API docs for HostConfig.PidMode
The `--pid` flag was added in Docker 1.5.0, but the
API changes were not documented. In Docker 1.12.0,
`--pid=container:<name|id>` was added as an additional
option, but also undocumented.

This adds the missing API documentation for this
option.

Also see commits
47e3da848ffbe88d0188ae6cfc09d6e1668bc293 (for 1.5.0), and
ebeb5a0422be47e703353e327606a380eb9962ab (for 1.12.0).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c9b5addc5022dba33d5d0443b49b2e4c0041ef3
Component: engine
2016-07-12 01:52:42 +02:00
a5531ff991 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)
Upstream-commit: ff98da0607c4d6a94a2356d9ccaa64cc9d7f6a78
Component: engine
2016-07-11 16:48:08 -07:00
cb38cf39e2 Add support for comma-separated --auto-accept syntax.
Signed-off-by: John Harris <john@johnharris.io>
Upstream-commit: 8e148827734a94165156adfd0f6d202d28dff142
Component: engine
2016-07-11 15:47:04 -07:00
abbe69120e Remove execution driver
We use containerd and there is no execution driver anymore.

Addresses: https://github.com/docker/docker/issues/24461

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1fb1136fecfd761300a38f64ac9178979cc0b270
Component: engine
2016-07-11 14:52:27 +08:00
4aeaa2fa8d Merge pull request #24432 from sfsmithcha/doc_service_constraint
add constraint to service create ref
Upstream-commit: 63186c06cb7ea5c437d6a3faa1c3f190134c7be5
Component: engine
2016-07-07 21:06:50 -07:00
6594994c99 Merge pull request #24426 from thaJeztah/add-iptables-to-multi-daemon-docs
add iptables=false to docs for multiple daemons
Upstream-commit: bd37b8305275946c06793278425f9bb83d0bafa9
Component: engine
2016-07-07 18:50:45 -07:00
7cb7f0210f add constraint to service create ref
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 093817031acd2b8dc17cba5c3c994b2d6d19dc0e
Component: engine
2016-07-07 18:25:37 -07:00
1af13ec6b5 add iptables=false to docs for multiple daemons
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1255e53e2890149df3c919af7aac88237069e1bb
Component: engine
2016-07-07 14:54:44 -07:00
a83cb2f41d Merge pull request #24291 from vdemeester/docs-cli-reference-updates
Updates on cli reference documentation
Upstream-commit: b98ba9a1d66d9b82eec510fb60a1ff7d7f2e7b0f
Component: engine
2016-07-07 14:28:54 -07:00
d634daae27 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: f4cfc6b9830ed236eb588d6a4dddca7455145e70
Component: engine
2016-07-07 20:43:18 +02:00
a5fef9cf19 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
2016-07-07 11:43:08 -07:00
f5a13a7cbe Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
c201e7c4a2 Merge pull request #24053 from cpuguy83/mounts_default_writable
Change defaults for mount writable and volume copying
Upstream-commit: 50674ec107a300067ded77912a2e39de88678c2c
Component: engine
2016-07-07 11:18:14 +02:00
508c55b4c2 Merge pull request #24330 from avsm/endpoint-cli-typo
make `docker service --help` text for `--endpoint-mode` more consistent
Upstream-commit: f85a231c5fc4159a5639228f6e13090637dfb6aa
Component: engine
2016-07-07 00:24:03 -07:00
3bc3d3b9a0 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: 668b8a998f5ebbe66c7376c432a5fd87208add73
Component: engine
2016-07-06 20:23:53 -07:00
7ac01fb32e Use newer default values for mounts CLI
In the API:
`Writable` changed to `ReadOnly`
`Populate` changed to `NoCopy`

Corresponding CLI options updated to:
`volume-writable` changed to `volume-readonly`
`volume-populate` changed to `volume-nocopy`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 56f3422468a0b43da7bae7a01762ce4f0a92d9ff
Component: engine
2016-07-06 22:34:39 -04:00
08bcf7365f 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: 7342e42fcecbc243bcb8723b8422879662452017
Component: engine
2016-07-06 13:04:50 -07:00
b214ee32d9 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: 2de9585f5ea798cbff23045d9d19ba239d5e5431
Component: engine
2016-07-06 12:10:28 +01:00
e4dfc2d04c Validate hostname starting from 1.24 API.
In order to keep a little bit of "sanity" on the API side, validate
hostname only starting from v1.24 API version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6daf3d2a783fd042e870c8af8bbd19fc28989505
Component: engine
2016-07-06 09:13:59 +02:00
730f2d8b64 Merge pull request #24287 from ottok/fix-spelling
Fix spelling in comments, strings and documentation
Upstream-commit: 1763474a84770e8af96a065551bc328124222f13
Component: engine
2016-07-03 22:34:00 +02:00
0bdbf282f3 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
2016-07-03 20:58:11 +03:00
aa1ae84c39 Merge pull request #24264 from runcom/mandokerd8
man: add missing --add-runtime
Upstream-commit: afce0f594688b51038bff8d697e3c3eeca323e12
Component: engine
2016-07-03 10:13:28 -07:00
be820b6010 Fix typo
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
Upstream-commit: 76b09be69683d19c8a9c8cb6c8b693941f62b2ec
Component: engine
2016-07-03 15:20:27 +02:00
9ccd52b87e man: add missing --add-runtime
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 585332dfe0b4b38f428deb680086b6d69275100d
Component: engine
2016-07-03 11:57:44 +02:00
e73e440019 Merge pull request #24251 from thaJeztah/fix-readonly-flag
fix typo in "readonly" flag in documentation
Upstream-commit: 3b6bd66cc9f2dcc09f5d4c057770cc28e29dd614
Component: engine
2016-07-02 08:38:16 -07:00
54e6f114f3 Merge pull request #24245 from cloojure/patch-4
Update network_create.md
Upstream-commit: 534753663161334baba06f13b8efa4cad22b5bc5
Component: engine
2016-07-02 11:32:40 +02:00
fae991c296 Merge pull request #23977 from Morsicus/master
Update doc remote api (container inpect part) 
Upstream-commit: 1a0bca56f2734e0c073dbbabd63f0459d6384810
Component: engine
2016-07-02 11:19:48 +02:00
67366b8e43 Update docker_remote_api_v1.22.md
Update docker_remote_api_v1.23.md
Update docker_remote_api_v1.24.md
Update docker_remote_api_v1.25.md

look like ExecDriver is not return anymore

Signed-off-by: Mickaël Fortunato <morsi.morsicus@gmail.com>
Upstream-commit: 166928a24bf5f3b23103b8ad09f134e277c00d6a
Component: engine
2016-07-02 10:58:46 +02:00
7308735be9 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: ac12696ff48aeb115e3d9ce3b13cfa54342b5aee
Component: engine
2016-07-01 17:08:59 -07:00
49ffacf76b 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: 9aed7d1a3dd7677cbba6b92952a9d28801cf1ceb
Component: engine
2016-07-01 16:54:30 -07:00
c3e3e8c836 Update network_create.md
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 68b8cc9735e9f966dd0e7b3b2d56835310100c2a
Component: engine
2016-07-01 16:16:53 -07:00
9da2bc7d4c Merge pull request #24059 from sfsmithcha/fix_cli_ref_menu
add menu.md, make index.md command line reference, update typos/minor…
Upstream-commit: 691bbeaf4411c56b9f5f19efb54db01c533ab8fc
Component: engine
2016-07-01 10:00:54 -07:00
db7f1cc524 Merge pull request #24128 from thaJeztah/rename-desired_state-filter
rename desired_state filter to desired-state
Upstream-commit: b8988824616017a7ff4a13475dde23f7677aa21c
Component: engine
2016-07-01 18:34:02 +02:00
3b1a7d7ee7 Merge pull request #24179 from nicolaka/master
[Docs] added nfs docs
Upstream-commit: 75923481d71e53637b6f889b0aab6e47342b7c86
Component: engine
2016-07-01 12:38:57 +02:00
b4d6f25674 Add documentation for external CA features in API/CLI
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fa147591edfb5fe5d5fb8952cdb9bfec1b4ae6c4
Component: engine
2016-06-30 18:08:57 -07:00
6b4b42d73a 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: d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Component: engine
2016-06-30 14:49:46 -07:00
14e8a9a9a9 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: f98f596c19cb589569ec89bd12d562d8ddd03843
Component: engine
2016-06-30 14:30:11 -07:00
624acb6899 [Docs] clarified local volume driver docs
Signed-off-by: Nico <nicolaka@gmail.com>
Upstream-commit: 841f9859944250585b2adf2c9bf2ad5332ccc0bd
Component: engine
2016-06-30 14:15:44 -07:00
939b820305 make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 184afb92bf0bda1f47b5e1812ee1134328e272e2
Component: engine
2016-06-30 21:17:51 +08:00
d648d9a308 docs: add note that we no longer send container-id for exec
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 82876c0f5b41fe4e3ee33e0bc77f2560b1a6535f
Component: engine
2016-06-29 13:30:09 -07:00
defc31809a Merge pull request #24105 from vdemeester/24094-fix-swarm-join-doc
Fixes /swarm/join endpoint documentation
Upstream-commit: d68415a949f4ba62d0929ebc53825fbab6ff1e36
Component: engine
2016-06-29 10:48:41 -07:00
596823812f Merge pull request #24126 from noxiouz/fix_doc_api
Remove extra comma in Image Pull API examples
Upstream-commit: e51fc722388431eeb2a94ab224d9d8636df85a97
Component: engine
2016-06-29 18:16:04 +02:00
d906df91ca Remove extra comma in Image Pull API examples
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
Upstream-commit: 307c39c187f8785d8edae4bfd460e2dd0432626a
Component: engine
2016-06-29 19:04:42 +03:00
e14d2bc523 add documentation for desired_state filter
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 36f57f7d024e44b1db7f5cd0c24526f4cdfb7234
Component: engine
2016-06-29 08:27:25 -07:00