Commit Graph

9 Commits

Author SHA1 Message Date
806650627f Add network ID to container inspect
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
2016-01-14 22:33:41 +08:00
38393c4316 fix typo
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
Upstream-commit: b4d4a805eaaf56c071327a528d8837f18796e209
Component: engine
2016-01-01 20:39:04 +01:00
9bd14de85f fix incorrect ip addresses in networkingcontainers
Signed-off-by: Donovan Jones <git@gamma.net.nz>
Upstream-commit: 2bd8322dba34eb5855ca5cd3af04f0f1289b3d45
Component: engine
2015-12-18 16:21:24 +13:00
04396c69aa Add the actual command in this example.
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: d8d38f234563a3be0b23cc94df3a9453eacfdee8
Component: engine
2015-12-09 10:17:39 -07:00
d1c20a52eb Correct some typos for docs
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 4d66f18be07b13cf41c48190d813fc045bb46678
Component: engine
2015-11-24 15:14:32 +08:00
4cd1a52462 Merge pull request #18026 from woodvi/doc-network-tutorial
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
2015-11-20 10:46:00 +01:00
0cbb4862c1 change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example
Signed-off-by: Victor I. Wood <viw@t2am.com>
Upstream-commit: ac526193afca9cb529d6c61f88bbdde11e2382aa
Component: engine
2015-11-16 12:41:06 -08:00
914d3208ce Fixing issue noted by user
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0a316477802466c50a66d165f3f9c2e4c827675e
Component: engine
2015-11-13 10:28:51 -08:00
ecd671294f 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>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00