dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-10 01:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,805 Commits 19 Branches 592 Tags
f81e4e8d577dbeacb597bcbbe76908904e4e91ed
Commit Graph

278 Commits

Author SHA1 Message Date
lixiaobing10051267
f9f6145003 add bash symbol for docker network inspect 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 7c3a26db16)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:55 +02:00
Alessandro Boch
e289fc155a Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e74a937b00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:46 +02:00
YuPengZTE
8ae21d6d4d The etc and dot is seprated 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
(cherry picked from commit bd914ff5a3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:38 +02:00
lixiaobing10051267
bc97dc1e50 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 2d1d4684f0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:16:46 +02:00
Sebastiaan van Stijn
99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:13 -07:00
Charles Smith
dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:29 -07:00
Sven Dowideit
be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates 
2016.09.08 engine docs updates
 2016-09-09 21:43:38 +10:00
Vincent Demeester
c63cdcd948 Merge pull request #26362 from lixiaobing10051267/masterIfconfig 
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-08 14:34:00 -07:00
Sven Dowideit
dc0d2166d5 Merge pull request #26245 from dbdd4us/master 
add volumes, networks, nodes and services into label doc
(cherry picked from commit 384de833c0)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:38:02 -07:00
Vincent Demeester
9c2b789caf Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs 
some fixes to clean up new plugin system docs
(cherry picked from commit c1b82df740)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:35:22 -07:00
Vincent Demeester
af9378f713 Merge pull request #25996 from yuexiao-wang/fix-docker-daemon 
Replace docker command from 'docker daemon' to 'dockerd'
(cherry picked from commit aff33055ac)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:06:57 -07:00
Sebastiaan van Stijn
909f9f5ea8 Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
(cherry picked from commit 88a6a7763b)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:02:11 -07:00
Akihiro Suda
f436a41d0c Add a note about the open(2) and rename(2) on AUFS and OverlayFS 
Close #25409
Update #10180

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit aab101a770)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
Charles Smith
4534b9e6c3 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e56dd0e0e7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
Charles Smith
3da4ac64af add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn
798e0b07cb Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f0230049f0)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:43 -07:00
Sebastiaan van Stijn
4b9b07f281 Merge pull request #25425 from thaJeztah/remove-rc-suffix 
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
85b9530e26 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa942)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:19 -07:00
mapk0y
b7e1ea51a0 fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
(cherry picked from commit a94b48923e)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-07-27 20:40:26 +10:00
allencloud
4cd455a8d9 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 4e959ef2f7)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:18:15 -07:00
Arnaud Porterie (icecrime)
c61fa33c23 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>
(cherry picked from commit c0c7d5e715)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-12 15:50:38 -07:00
Kara Alexandra
e0960bd8e7 Add blanks lines in docs for clarity 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
(cherry picked from commit d0737e9ac0)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-12 15:43:39 -07:00
Otto Kekäläinen
664c75ebba Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
(cherry picked from commit 644a7426cc)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:31:42 -07:00
Antonio Murdaca
b375ccfee7 fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit a4143e6756)
 2016-06-30 17:12:37 -07:00
Lei Jitang
bb09b3e5f1 Remove dm.no_warn_on_loop_devices in info warning 
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 2aa01e0fbc)
 2016-06-30 16:58:15 -07:00
Akihiro Suda
cab4e108c8 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit ddf9b6f666)
 2016-06-30 16:47:52 -07:00
Sven Dowideit
eaf5b17592 Removing some url links that can be resolved using src markdown links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 01f9cbc366)
 2016-06-30 16:47:46 -07:00
David M. Karr (fullname at gmail.com)
6de8049ab5 Update work-with-networks.md 
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
(cherry picked from commit a54c3fbb8a)
 2016-06-30 16:47:46 -07:00
Kai Qiang Wu(Kennan)
db4153cc90 Fix the missing 'ls' 
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
(cherry picked from commit cbd240581f)
 2016-06-30 16:47:43 -07:00
Akihiro Suda
ba77356d98 Add overlay2 description to overlayfs-driver.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 8625adbd67)
 2016-06-30 16:47:42 -07:00
Kevin Jing Qiu
c7d35daad8 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704)
 2016-06-30 16:47:40 -07:00
Yong Tang
abb6e38208 Fix reference link error in Jenkins docs failure 
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cb7fb4d2e)
 2016-06-30 16:47:37 -07:00
Sven Dowideit
d546db33ff href links are not converted from file.md by hugo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit ad1819ca1d)
 2016-06-18 20:58:24 -07:00
Victoria Bialas
d1c91b41e1 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>
(cherry picked from commit 5bc730eda7)
 2016-06-18 20:58:23 -07:00
Sven Dowideit
2a96ac66ea Merge pull request #23492 from londoncalling/docs-surface-tutorials-v1.12 
surfacing Learn by example topics to top level of Docker Engine docs
 2016-06-14 21:10:17 +10:00
Victoria Bialas
8eca8089fa 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>
 2016-06-13 13:32:30 -07:00
Michael Crosby
8a2f9a249c Merge pull request #22126 from dmcgowan/overlay-native-diff 
Overlay multiple lower directory support
 2016-06-13 13:15:39 -07:00
Derek McGowan
a546042b91 Add documentation for using overlay2 
Add mention in dockerd command line and storage driver selection documentation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-06-13 11:06:47 -07:00
Sebastiaan van Stijn
feabf71dc1 network docs cleanup 
This fixes some Markup and formatting
issues in the network documentation;

- wrap text to 80 chars
- add missing language hints for code examples
- add missing line continuations (\)
- update USAGE output for Cobra

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-06 14:20:41 +02:00
Sven Dowideit
0cddc783cf docs validation fixes 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-03 21:43:45 +00:00
Sven Dowideit
98c245c9e6 Merge pull request #23193 from allencloud/fix-typos 
use grep to find all a/an typos
 2016-06-02 18:45:08 -07:00
allencloud
c1be45fa38 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-02 17:17:22 +08:00
unclejack
5e85ec82af aufs,overlay: disable on eCryptfs 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-06-01 21:00:35 +03:00
Sebastiaan van Stijn
bb80563a81 Merge pull request #22987 from Microsoft/jjh/labeldocs 
Docs: Label clarification
 2016-05-25 20:56:54 +02:00
John Howard
b2643b6953 Docs: Label clarification 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-05-25 11:48:07 -07:00
Sven Dowideit
a7bf4e4832 docs: update graphdriver compatibility matrix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-05-25 18:33:45 +00:00
Matt Bentley
0b8ea4387a Re-apply changes made in 24ec73f 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-05-25 08:46:39 -04:00
Matt Bentley
79205c3f06 Fix thin pool devicemapper docs overwritten 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-05-25 08:45:51 -04:00
Yong Tang
55b1724018 Fix a typos in docs of networking guide 
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-21 13:19:05 -07:00
Sebastiaan van Stijn
5fb7f9b29e Suppress "IPv4 forwarding" warning for --net=host 
Containers using the host network stack (--net=host)
are not affected by "ip-forwarding" being disabled,
so there's not need to show a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-18 20:10:31 +02:00