e79a815f73
Merge pull request #432 from lukahartwig/docs-add-docker-events-examples
...
Added docker events example with until option to documentation
Upstream-commit: b8d325efd5
2017-08-14 10:57:46 +02:00
c66aa086ca
Make the example match the documentation
...
the missing `driver` made my bridge not have the correct MTU when i copied from the example and not the doc table. Brings them into alignment.
Signed-off-by: bryfry <bryon@fryer.io >
Upstream-commit: 6118658f73
2017-08-11 21:47:34 -04:00
a87bcbcfcf
Added docker events example with until option to documentation
...
Signed-off-by: Luka Hartwig <mail@lukahartwig.de >
Upstream-commit: f959ac7fba
2017-08-11 01:29:48 +02:00
48c6aae018
Fix invalid plugin references in docs
...
The plugins `tiborvass/sample-volume-plugins` and `tiborvass/no-remove`
do not exist.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2dca576a4c
2017-08-07 11:15:39 +02:00
a8778a8f6e
Merge pull request #405 from beenanner/patch-1
...
Fix missing missing backtick in documentation for node ls
Upstream-commit: b0cc841631
2017-08-02 08:58:53 +02:00
2a797862f7
Fix missing missing backtick
...
Signed-off-by: Jonathan Lee <jonjohn1232009@gmail.com >
Upstream-commit: 9e4ad4889e
2017-08-01 20:45:43 -04:00
4310c5e46a
Merge pull request #403 from Zebrilee/fix-issue-159
...
update service create and update options in commandline documentation
Upstream-commit: c6e497d15c
2017-08-01 14:08:29 +02:00
97a283fbdb
update service create and update options in commandline documentation
...
Signed-off-by: zebrilee <zebrilee@gmail.com >
Upstream-commit: 5fe09164f5
2017-07-31 23:26:02 +02:00
db556c6449
Merge pull request #399 from Zebrilee/fix-issue-253
...
modify foo by container in order to clarify the documentation
Upstream-commit: f47d9803fd
2017-07-31 10:40:08 -07:00
540600c393
Merge pull request #393 from thaJeztah/add-missing-is-task-filter
...
Docs: update filter options for docker container ps
Upstream-commit: 7ac1db2f8f
2017-07-31 09:51:13 +01:00
05235298ea
modify foo by container in order to clarify the documentation
...
Signed-off-by: zebrilee <zebrilee@gmail.com >
Upstream-commit: 2d5f9d83e7
2017-07-29 20:44:50 +02:00
c16c5f3db8
Fix repo references in docs
...
Since CLI was moved to a separate repo, these references are incorrect.
Fixed with the help of sed script, verified manually.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 6d85a4f5f8
2017-07-28 10:32:42 -07:00
ba32b46d68
Docs: update filter options for docker container ps
...
The `is-task` filter was only documented in the usage
section, but this section is not used in the documentation.
This patch adds the missing filter, synchronises the
man page source, and does some slight rephrasing
and reformatting of the filters.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 46064f33f4
2017-07-27 22:10:26 +02:00
c394e66cf8
fixed word network on volume_ls.md
...
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com >
Upstream-commit: f5bca7af10
2017-07-24 05:18:10 -05:00
96839aeeb6
Merge pull request #223 from ripcurld0/docs_cp_prm
...
Update the cp command docs to include archive
Upstream-commit: 25ca529388
2017-07-21 11:14:15 +02:00
c4357dce36
Merge pull request #332 from tych0/docs-fixups-for-password-stdin
...
Docs fixups for password stdin
Upstream-commit: 3d76febd17
2017-07-20 11:31:23 +02:00
9fab9786f4
docs: add --password-stdin
...
also add an example of usage
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 3e392505a8
2017-07-18 15:25:46 -06:00
72d8e914bc
Merge pull request #331 from yuexiao-wang/docker-search-filters
...
Fix filters displaying for docker search
Upstream-commit: 03a46a66bd
2017-07-14 23:30:43 -07:00
c6415e10ce
Merge pull request #314 from allencloud/add-filter-scope-for-events
...
docs: add filter scope for command events and more cluster events
Upstream-commit: 47370b4863
2017-07-14 23:28:55 -07:00
42cbae8c65
Service privileges: CLI reference docs & completion
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5cc7ac2990
2017-07-14 22:30:47 -07:00
c456febc9c
docs: add filter scope for command events and more cluster events
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 8639c9baf8
2017-07-15 09:17:35 +08:00
d85711734b
More about ARG and build stages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: ad5d035988
2017-07-14 16:59:21 -04:00
0b42de4e27
Clarify docs about ARG in FROM
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2880030814
2017-07-14 16:55:42 -04:00
becbfbd6d3
docs: add documentation for dm.libdm_log_level
...
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.
Signed-off-by: Aleksa Sarai <asarai@suse.de >
Upstream-commit: c7710819a5
2017-07-14 16:52:33 +10:00
d96f150bfb
Fix filters displaying for docker search
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bd64ad25fb
2017-07-14 08:56:20 +08:00
aa221f747d
Fix typo (proceed -> precede)
...
Signed-off-by: Valentin Lorentz <progval+git@progval.net >
Upstream-commit: 4f3a8aecad
2017-07-07 13:17:15 +02:00
d2b6d249be
Merge pull request #243 from vieux/scale2
...
add `--detach` to docker scale
Upstream-commit: 43fb4a4547
2017-07-04 16:36:59 +02:00
f186d3c42f
Merge pull request #289 from mstanleyjones/multiple-env
...
Provide examples for multiple uses of the same flag
Upstream-commit: 357ff50fa9
2017-07-04 12:48:20 +02:00
9e2f4854f6
Clarify that you can use -d and --rm together now
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: c63485b47d
2017-07-03 16:43:41 -07:00
017354f791
Provide examples for multiple uses of the same flag
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ef61582591
2017-07-03 16:21:28 -07:00
129c66c19b
Some builder docs improvements
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29b419eed5
2017-06-29 14:20:16 -07:00
241ddf7729
Adding docs for "overlay2.size" storage-opt
...
Signed-off-by: Dhawal Yogesh Bhanushali <dbhanushali@vmware.com >
Upstream-commit: ff2552f7a1
2017-06-27 23:58:57 -07:00
37752ce207
add --detach to docker scale
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 6c6b1091d9
2017-06-27 09:55:10 -07:00
59836240bc
Merge pull request #230 from mstanleyjones/remove-userns-details
...
Remove specific config info about userns-remap
Upstream-commit: 2eac0bb7b7
2017-06-26 21:11:53 -07:00
146ac6efc7
Merge pull request #225 from mstanleyjones/ps-markdown-formatting
...
Reformat filtering options in ps ref
Upstream-commit: 8fc3179111
2017-06-26 21:05:42 -07:00
6c88b7bdd9
Fix false Liquid errors
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 11c1729e00
2017-06-26 12:50:34 -07:00
9b6e155e52
Remove specific config info about userns-remap
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 8222baf263
2017-06-22 15:09:14 -07:00
c6aa6c7ead
Reformat filtering options in ps ref
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0888df3058
2017-06-21 10:31:03 -07:00
bcbca95cb7
Merge pull request #222 from thaJeztah/carry-moby-33290
...
Explain `stack deploy` with multiple Compose files
Upstream-commit: 4b1055aaa6
2017-06-21 17:36:20 +02:00
65ef46ebdd
Update the cp command docs to include archive
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: e4c70d390d
2017-06-21 13:20:47 +03:00
3d78550cb5
Merge pull request #164 from mstanleyjones/clarify-attach
...
Clarify ability to attach multiple times
Upstream-commit: 9f00ec085f
2017-06-21 10:59:34 +02:00
0e797a650f
Explain stack deploy with multiple Compose files
...
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.
Signed-off-by: Denis Washington <denis@denisw.de >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 36fa4af30b
2017-06-20 21:23:21 -07:00
cd9e55249f
Added usage example for -e for exec
...
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c848d9b22d
2017-06-15 17:24:41 +02:00
cd16e5cc8b
docs/reference/builder.md: mention that USER directive also allows to specify the user group.
...
Signed-off-by: Slava Semushin <semushin@redhat.com >
Upstream-commit: a84463d8d5
2017-06-14 15:49:37 +02:00
2f5b714872
Update docs, completion scripts for disable-legacy-registry
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 2b8f0eef7338f37104464154ba65aef7db3b9703)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ee1bbab620
2017-06-14 02:48:46 +00:00
9a66d3e2b0
Merge pull request #32804 from bbodenmiller/patch-1
...
remove extra word
(cherry picked from commit 9db03bd8cdad3c8804105cb5794ebad5e728f48f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 3eaec0071c3ce1b7201e37859afe5bcb78d4f215)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: ba4dcadcaa
2017-06-14 02:48:46 +00:00
090c6ccf05
Merge pull request #32791 from djalal/patch-1
...
fix typo
(cherry picked from commit 32a52716b964373b4ac464052e73ea5da79856c6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit fcbd93f52032593cc71b298c00a46fd354356650)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8247a36058
2017-06-14 02:48:46 +00:00
13d31e4cd8
Merge pull request #32735 from bhavin192/patch-1
...
Add note about host-dir in VOLUME
(cherry picked from commit f2fff9d913a8ab0436dd56033189a7c3713a59a2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 8fd6547fc3eb67e7efa7efb007ae6a4494cd2bb3)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5bf86c1984
2017-06-14 02:48:46 +00:00
fc9f540d08
Merge pull request #32724 from PatrickLang/patricklang-win-memory
...
Adding more on -m and --memory
(cherry picked from commit c3fbca106552f2dadcb89510ff87945b50f36419)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit b4047a849bd3018f8a8eabf34613a4fca57f818e)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: b1738f4505
2017-06-14 02:48:46 +00:00
a08039c09b
Merge pull request #32684 from scjane/patch-3
...
Update builder.md
(cherry picked from commit 831066337743fc29ff122fce51afe44b8b3b3ba9)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit bc66821abbcf50c721ce9b8f52b339fda102d389)
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 7955683eb2
2017-06-14 02:48:46 +00:00
