Sebastiaan van Stijn
ad119a9fca
Merge pull request #26413 from lixiaobing10051267/masterLabel
...
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
2016-09-22 02:07:53 +02:00
Sebastiaan van Stijn
afc1ccd008
Merge pull request #25466 from justincormack/deprecate-maintainer
...
Begin process of deprecating MAINTAINER
Upstream-commit: 4d187df277153bf704868d9a67b1e4fa29abf873
Component: engine
2016-09-13 12:07:04 +02:00
lixiaobing10051267
8a3467d6a3
Labels info ommitted while inspecting self-defined network
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d5fcf57acbc9b77f0b38221d2eb0079be7169904
Component: engine
2016-09-08 17:27:33 +08:00
Michael Crosby
656be9ef36
Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example
...
Updated Windows mounting example
Upstream-commit: 368a27a8d80337918d465c8c98100a4e22d9ef1a
Component: engine
2016-09-06 09:05:50 -07:00
Vincent Demeester
87b65ede10
Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
...
fix the wrong option info while specifying the command with the "--help"
Upstream-commit: d8e151535017b4bb4ee5aa8281f1b9bb7bffa397
Component: engine
2016-09-06 15:44:44 +02:00
lixiaobing10051267
9e0fb207fb
fix the wrong info while specifying the command with the "--help"
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 2626d341e7b39d5d6182d8af0cec425420f8f176
Component: engine
2016-09-04 04:26:56 +08:00
Petr Švihlík
8c44f51734
Updated Windows mounting example
...
Signed-off-by: Petr Švihlík <svihlik.petr@gmail.com >
Upstream-commit: ea0d7b1b3b4d89e7601cb93740fa9ee0e000dd9f
Component: engine
2016-09-03 18:23:43 +02:00
lixiaobing10051267
4e526a616e
modify output info for docker pull centos
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6becc1a5774e391a3dcade645cdeff46577bf6fa
Component: engine
2016-09-03 22:27:18 +08:00
Vincent Demeester
33fbdef4b0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
Upstream-commit: 670eaa71a0629323327cb5604c44abf14890d4b4
Component: engine
2016-08-31 14:41:22 +02:00
Harald Albers
a779e2caf3
Fix argument order for docker create in tutorial
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 109334030cd970475b0ec313b0f8709a5cad1c42
Component: engine
2016-08-31 09:41:04 +02:00
Charles Smith
458bf87add
some fixes to clean up new plugin system docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1dee308281c48a1363fff2433d842fcaa971dce4
Component: engine
2016-08-30 13:52:13 -07:00
Kara Alexandra
346f8a271b
Add option to specify name without --name in volume create
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com >
Upstream-commit: ba3f0bf0e7d4f94eb94023278adcfad4ca8fe9d7
Component: engine
2016-08-25 14:20:06 -07:00
Justin Cormack
8610d3a32b
Begin process of deprecating MAINTAINER
...
This may take some time, but start by pointing people at
LABEL instead.
MAINTAINER predates general LABEL and has basically no tooling,
only allows a single item to be added, and is has been
unofficially deprecated for some time, with many images not
including it, but we have never specifically said that it
should be replaced by LABEL as a better more generic metadata
solution.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: efb9e38ebab4b60a73e3295e3c468813182fd3ea
Component: engine
2016-08-25 18:43:27 +01:00
Lei Jitang
8eacfa50f9
Fix inspect network show gateway with mask
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 096bb5fb0740656b91b3e35f8df23c79270f7f90
Component: engine
2016-08-11 21:08:54 -04:00
johnharris85
8c1cecb625
Fix broken gem instructions.
...
Signed-off-by: John Harris <john@johnharris.io >
Upstream-commit: 7f2a2b22fc1e81fc366531af1f598af563b96e09
Component: engine
2016-07-26 15:53:11 -07:00
Arnaud Porterie (icecrime)
a4c4731dc9
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 >
Upstream-commit: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
2016-07-12 13:01:35 -07:00
Charles Smith
a7e56d2212
Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs
...
[Docs code snippets] Make it obvious what is command what is result
Upstream-commit: c9e739011574f3b3fb0a1f450e69304b6dbdabf6
Component: engine
2016-07-11 08:26:30 -07:00
Lucas Chi
6c06986ed1
Fix grammar in docker volumes tutorial
...
Signed-off-by: Lucas Chi <lucas@teacherspayteachers.com >
Upstream-commit: 7b3ac47fa4c2dd6850959c3c230289eefbc4dbe3
Component: engine
2016-07-11 10:34:02 -04:00
Kara Alexandra
90002d7a0a
Add blanks lines in docs for clarity
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com >
Upstream-commit: d0737e9ac0bfcbac0e212d157ab305e561eea3ee
Component: engine
2016-07-01 11:40:22 -07:00
Victoria Bialas
9b853ff739
install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
...
fixing links to d4mac and d4win
updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.
updates per Sven's comments in the PR
removed duplicate line in tutorials menu.md
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 5bc730eda76351ab669a60a5fc95fd273e399d88
Component: engine
2016-06-17 14:46:35 -07:00
Victoria Bialas
ce19593c15
surfacing Learn by example topics to top level of Docker Engine docs
...
fixing links after moving surfacing tutorials
fixing more links for the newly located tutorials
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
2016-06-13 13:32:30 -07:00