Commit graph

6408 commits

Author SHA1 Message Date
Akihiro Suda
d5dee554ea Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run
Fix description and link  of 'docker run [-a]'
2016-11-28 10:31:06 +09:00
Sebastiaan van Stijn
9dc0c8ec32 Merge pull request #28824 from lixiaobing10051267/masterPlugin2
modify invalid url in plugins_network.md
2016-11-26 23:22:52 +01:00
Yanqiang Miao
08ff4f427e Fix a description of 'docker run [-a]'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-26 22:56:29 +08:00
Antonio Murdaca
ce0068ed04 Merge pull request #28780 from vieux/accept_src_in_secret
support src in --secret
2016-11-26 14:34:30 +01:00
Vincent Demeester
c36c63b308 Merge pull request #28815 from dnephin/add-short-option
Add a short flag for docker stack deploy
2016-11-25 21:18:09 +01:00
Daniel Nephin
f1dd721b69 Add a short flag for docker stack deploy
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-25 13:23:36 -05:00
Vincent Demeester
3e58117608 Merge pull request #28771 from dnephin/add-missing-service-hostname-update
Allow hostname to be updated on service
2016-11-25 10:26:06 +01:00
lixiaobing10051267
fc7c235f84 modify invalid url in plugins_network.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-11-25 15:40:51 +08:00
Yanqiang Miao
18724726c2 Fix some syntax error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-25 10:03:28 +08:00
Daniel Nephin
1c65cb6657 Allow hostname to be updated on service.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-24 15:44:35 -05:00
Yong Tang
2510f254ee Update docs of docker network ls --filter
Currently the help output of `docker network ls --filter` is:
```
Options:
  -f, --filter value   Provide filter values (i.e. 'dangling=true') (default [])
  ...
```
This caused confusion as only the following filters are supported at the moment:
 - `driver`
 - `type`
 - `name`
 - `id`
 - `label`

This fix update the help output of `docker network ls --filter` and `network_ls.md`.
The `dangling=true` description has been replace to:
```
Options:
  -f, --filter filter   Provide filter values (i.e. 'driver=bridge')
  ...
```

This fix fixes 28786.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-11-24 08:14:36 -08:00
Vincent Demeester
7aae360c41 Merge pull request #28802 from yuexiao-wang/fix-cli-typo
Add options for docker plugin enable and fix some typos
2016-11-24 17:03:56 +01:00
yuexiao-wang
9e414bfa6b Add options for docker plugin enable and fix some typos
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-25 04:07:06 +08:00
Sebastiaan van Stijn
b3687bdcdc Merge pull request #28602 from dattatrayakumbhar04/nw-connect-paused-container-doc
28600: Docs: network connect for container in Created/Stopped state
2016-11-24 15:04:53 +01:00
Victor Vieux
f70470b71e support src in --secret
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2016-11-23 14:30:57 -08:00
John Howard
c8c1dfbaf3 Fixes typo 'bin-mounts'
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-23 14:01:57 -08:00
Victor Vieux
ae64cae74e Merge pull request #28760 from ehazlett/carry-28576
Update Secret Command help (carry #28576)
2016-11-23 12:29:55 -08:00
dattatrayakumbhar04
16c9cdad6f 28600: Docs: network connect for container in Created/Stopped state
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
2016-11-23 20:20:37 +00:00
Vincent Demeester
2c978bd946 Merge pull request #28765 from vdemeester/update-docker-info-docs
Update docker info cli reference documentation
2016-11-23 17:27:08 +01:00
Vincent Demeester
d28eaa1171
Update docker info cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 17:20:12 +01:00
erxian
d87c91e39f update secret command
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-23 10:07:09 -05:00
Vincent Demeester
55cd9c4edc Merge pull request #28758 from vdemeester/update-plugin-enable-cli-doc
Update plugin enable cli reference documentation
2016-11-23 15:53:02 +01:00
Vincent Demeester
43297dd6f8
Update plugin enable cli reference documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-23 15:42:40 +01:00
Harald Albers
bb96e18b19 Move docker stack docs out of experimental
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-23 11:14:38 +01:00
Victor Vieux
22ba220e86 Merge pull request #28727 from cyli/do-not-display-secret-digest
Do not display the digest or size of swarm secrets [1.13]
2016-11-22 16:44:06 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
cyli
fe127b7eae Update docs to reflect no longer displaying secret digest or size.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-11-22 18:18:56 -05:00
Tibor Vass
6547609870 plugins: misc fixes
Rename variable to reflect manifest -> config renaming
Populate Description fields when computing privileges.
Refactor/reuse code from daemon/oci_linux.go

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-22 14:32:07 -08:00
Vincent Demeester
d145b0b93f Merge pull request #28726 from jacobtomlinson/docs-pull-concurrent
Document pull concurrent options
2016-11-22 23:11:27 +01:00
Jacob Tomlinson
b303381a4d Add concurrent uploads/downloads section
Document and link to the concurrent uploads/downloads daemon option.

Signed-off-by: Jacob Tomlinson <jacob@tom.linson.uk>
2016-11-22 21:59:10 +00:00
Sebastiaan van Stijn
313502488e Merge pull request #28506 from bfirsh/prepare-api-docs-for-swagger-docs
Prepare docs and Swagger definition for automatically generated API docs
2016-11-22 22:47:38 +01:00
Sebastiaan van Stijn
0cbc187447 Merge pull request #28715 from thaJeztah/add-warning-for-windows-plugins
add note that windows does not support managed plugins
2016-11-22 21:23:13 +01:00
Harald Albers
2e12055687 Fix typo in docs (Copmose)
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-22 19:09:30 +01:00
Sebastiaan van Stijn
f885463b58
add note that windows does not support managed plugins
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-22 16:01:14 +01:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:49:38 +00:00
Ben Firshman
993854f58f
Move API reference to new location
See: https://github.com/docker/docker.github.io/pull/606

Also:
- Add missing redirects to API reference pages
- Remove v1.25 and 1.26, because they are being replaced with
  swagger generated docs.
- Remove all other docs which aren't reference material, because
  this can live in docker/docker.github.io

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:47:25 +00:00
Sebastiaan van Stijn
700f618410 Merge pull request #28486 from vdemeester/docs-service-templating
Add documentation about templating support on…
2016-11-22 00:50:45 +01:00
Sebastiaan van Stijn
da4a2f16a0 Merge pull request #28664 from thaJeztah/update-service-ps-reference
Update service ps reference for "--no-trunc"
2016-11-22 00:48:03 +01:00
Victor Vieux
99a7289632 Merge pull request #28328 from aaronlehmann/duration-opts
cli: Add valid suffixes for remaining duration options
2016-11-21 14:03:00 -08:00
Sebastiaan van Stijn
6cc645c938 Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc
Update deprecation notes about v1 registry
2016-11-21 19:16:38 +01:00
Derek McGowan
c8f826f407
Update deprecation notes about v1 registry
Adds section about the hub deprecating the v1 protocol.
Adds note about intent to disable by default and remove support.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-21 09:39:48 -08:00
Sebastiaan van Stijn
90993640f0
Update service ps reference for "--no-trunc"
The "--no-trunc" option toggles between showing/hiding
digests.

This updates the reference to show this difference.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-21 17:39:58 +01:00
Vincent Demeester
88cdfc512b
Update cli reference for docker {,stack} deploy
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-21 12:36:31 +01:00
Vincent Demeester
227af35a17 Merge pull request #28607 from mstanleyjones/28133_iptables_false
Clarify that ipmasq rules are not added when iptables is false
2016-11-20 17:35:31 +01:00
bbayani
db3f06fd97 Clarify that ipmasq rules are not added when iptables is false
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-18 14:25:24 -08:00
Sean McIntyre
2c38d43eb5
Add HostConfig.Tmpfs to docs for container creation remote API
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca>
2016-11-18 15:00:07 -05:00
Aaron Lehmann
948e60691e Return warnings from service create and service update when digest pinning fails
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.

This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-18 09:31:31 -08:00
Vincent Demeester
4571ad05db
Add documentation about templating support on…
… services creation/update.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-18 15:28:01 +01:00
Vincent Demeester
6c447f552c Merge pull request #28354 from ripcurld00d/tag_creation
Change the docker-tag usage text to be clearer
2016-11-18 13:02:40 +01:00
Boaz Shuster
039aca05c2 Change the docker-tag usage text to be clearer
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2016-11-18 10:34:02 +02:00