0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23305 commits 14 branches 412 tags 338 MiB
Commit graph

58 commits

Author SHA1 Message Date
Brent Salisbury
8926af95e4 Updates to macvlan/ipvlan experimental docs 
- Added a few more diagrams.
- Fixed typos and a few additional  details.
- Moved experimental images to a new directory
  in /experimental/images per @cpuguy83 suggestion.

Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-03-18 18:46:46 -04:00
Zhang Wei
ca64269165 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-17 16:13:51 +08:00
Brent Salisbury
9cb6b51fa2 docs for experimental vlan net drivers 
Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-03-11 16:01:01 -08:00
Alan Thompson
65a381ae32 Update dockernetworks.md 
Make command line prompts consistent for both host and container shells.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-03-03 16:32:24 -08:00
Wen Cheng Ma
9f8f28684f Remove the duplication 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-03-01 17:53:36 +08:00
Vincent Bernat
db5ded0dfc docs: simplify some steps of the overlay network guide 
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2016-02-25 13:17:26 +01:00
Vincent Demeester
3646b14ecd Merge pull request #20528 from cloojure/patch-3 
Update dockernetworks.md
 2016-02-20 23:25:51 +01:00
hsinko
0b64280195 Update configure-dns.md 
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
 2016-02-20 11:51:59 +08:00
Alan Thompson
549fa67dae Update dockernetworks.md 
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-02-19 16:57:13 -08:00
Wen Cheng Ma
f03050cc4c Fix typo error of dockernetworks.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-02-19 17:18:52 +08:00
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
Sebastiaan van Stijn
7da5784b10 Fix documentation typos 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-15 15:46:56 +01:00
David Calavera
b734d0e8cc Merge pull request #20285 from moxiegirl/fix-user-guide 
Update the userguide to fix user feedback
 2016-02-12 11:07:03 -08:00
Mary Anthony
bf76b1d686 Update the userguide to fix user feedback 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-12 10:08:59 -08:00
David Calavera
3a3c953806 Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options 
Fix an erratum; s/two/three/
 2016-02-12 09:58:48 -08:00
Yi EungJun
8c93958fcb Fix an erratum; s/two/three/ 
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
 2016-02-13 00:14:35 +09:00
Roland Huß
03b25e024e Fix some formatting 
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example

Signed-off-by: Roland Huß <roland@jolokia.org>
 2016-02-12 10:34:55 +01:00
Aidan Hobson Sayers
d736a9d2c3 Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-12 01:42:15 +00:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Aditi Rajagopal
3024604054 Overlay Network needs Unique Hostname 
Resolves: #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
 2016-02-08 15:14:38 -06:00
Madhu Venugopal
6f863cfa18 Docs cleanup for networking features added in v1.10 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-02 06:10:41 -08:00
Wen Cheng Ma
ebd1f70165 docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-28 11:49:07 +08:00
Mary Anthony
e310d070f4 Creating Engine specific menu 
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-26 15:58:53 -08:00
Dave Barboza
f50d0d7fdb Fix minor doc grammar issues 
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
 2016-01-20 10:52:21 -05:00
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-15 10:03:29 +08:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Vincent Demeester
0ed2e26f51 Merge pull request #19157 from wenchma/update_build_bridges 
Update the doc of build-bridges.md
 2016-01-14 11:10:37 +01:00
Madhu Venugopal
2aa5f33b20 Docs update for link functionality in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
 2016-01-12 07:06:31 -08:00
Wen Cheng Ma
0ba6a128ee Update the doc of build-bridges.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-12 15:52:33 +08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
Santhosh Manohar
64a6dc3558 Docker changes for libnetwork vendoring.. 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:55 -08:00
Alessandro Boch
2bb3fc1bc5 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 10:09:16 -08:00
Jana Radhakrishnan
f0904affd1 libnetwork vendoring 
Vendoring libnetwork @ 9f0563ea8f430d8828553aac97161cbff4056436

Brings in:
    * Support for overlay network driver in 3.10+ kernels
    * Freebsd compilation fixes
    * Remove .dockerinit dependency
    * IPAM driver capability support
    * Network internal mode support
    * Misc. fixes

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-12-22 13:32:17 -08:00
Mary Anthony
55a65e18c0 Fixing typo reported by @projectvalis 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-12-19 12:47:24 -08:00
Sebastiaan van Stijn
6f930a2ffa Merge pull request #18700 from mqliang/patch-2 
Update dockernetworks.md
 2015-12-16 16:58:25 +01:00
Liang Mingqiang
f480b7c1f5 Update dockernetworks.md 
fix typo

Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-16 15:25:06 +08:00
Liang Mingqiang
e1f012cf39 fix typo in dockerlinks.md 
fix typo in dockerlinks.md

Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-12-16 11:21:39 +08:00
moxiegirl
94026969b4 Merge pull request #18389 from wenchma/doc_update_for_container-basics 
docs: delete draft container-basics.md
 2015-12-12 21:39:34 -08:00
Devvyn Murphy
76de01c138 Update custom-docker0.md (corrections) 
Corrected outdated internal link (regarding ```ip_forward``` system setting) . Corrected missing newline before bulleted list (for options configurable at server startup).

Signed-off-by: Devvyn Murphy <devvyn@devvyn.com>
 2015-12-10 13:24:02 -06:00
Patrick Hemmer
fd9d7c02fc don't try to use default route MTU as bridge MTU 
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
 2015-12-07 17:32:51 -05:00
Wen Cheng Ma
a947377297 Update the "Manually network" section with detailed info in container-basics 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-03 22:32:02 +08:00
Wen Cheng Ma
08328cb703 Add NETWORK_NAME_or_ID value for --net= option 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-12-02 22:49:35 +08:00
Sebastiaan van Stijn
bfdd94b0a8 Fix markup for markdown table 
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.

Changed the table to a plain HTML table as a workaround.

Also fixed indentation levels of two code examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-11-25 12:38:15 +01:00
Wen Cheng Ma
4d66f18be0 Correct some typos for docs 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-24 15:14:32 +08:00
Sven Dowideit
043f447e2e Fixes found by docs validation tool 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-23 11:19:38 +10:00
moxiegirl
6c5395360f Merge pull request #17883 from dave-tucker/bug/17709 
Add required ports for Overlay to docs
 2015-11-11 13:10:22 -08:00
David Currie
f16dceb632 Updates to Get started with multi-host networking 
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.

Signed-off-by: David Currie <david_currie@uk.ibm.com>
 2015-11-11 20:31:18 +00:00