Commit Graph

31 Commits

Author SHA1 Message Date
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
Dave Tucker 44a527d877 Add required ports for Overlay to docs
Fixes #17709

Signed-off-by: Dave Tucker <dt@docker.com>
2015-11-11 18:04:07 +00:00
Anthony Dahanne 4efe0def0a Implicitly use swarm:latest so that master and agent use the same version of swarm
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
2015-11-09 15:05:17 -08:00
moxiegirl 8aa8d51610 Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
Anton Polonskiy 3f331eaa40 fix typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
2015-11-05 18:33:16 +02:00
Nathan LeClaire 6326e6732d Revise commands in Compose section of multi-host quickstart
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-04 17:44:01 -08:00
Madhu Venugopal 39dfc536d4 Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 08:42:40 -08:00
Mary Anthony 0f1083c8da Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 05:34:54 -08:00
Mary Anthony 9ef855f9e5 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-02 21:14:55 -08:00