d560df1e09
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
2016-02-20 11:51:59 +08:00
59be9aceed
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
7d665cca4e
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
e1a8ad7624
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
949eabdb95
Merge pull request #20285 from moxiegirl/fix-user-guide
...
Update the userguide to fix user feedback
Upstream-commit: b734d0e8cc69eadaff86884c200d1ce21b37cdb3
Component: engine
2016-02-12 11:07:03 -08:00
5ceee3f64c
Update the userguide to fix user feedback
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: bf76b1d686018cebd043aa99152d68fbbe6bb977
Component: engine
2016-02-12 10:08:59 -08:00
ee0d6d6dac
Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
...
Fix an erratum; s/two/three/
Upstream-commit: 3a3c9538060ebe300cc2272ad28178450b5fdd53
Component: engine
2016-02-12 09:58:48 -08:00
0f9dad85b1
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 >
Upstream-commit: 8c93958fcb1b1fc838c76b08cc4dde4ce37691bb
Component: engine
2016-02-13 00:14:35 +09:00
c48f1ccfa7
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 >
Upstream-commit: 03b25e024e46a3254012268cda8919a8702b4cbc
Component: engine
2016-02-12 10:34:55 +01:00
7f66344ec0
Add docs for --ipv6 option, also add --internal as appropriate
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: d736a9d2c3758fcc4eac0b62e9c7b128388021c1
Component: engine
2016-02-12 01:42:15 +00:00
697a990701
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 99a396902f0ea9d81ef87a683489b2435408f415
Component: engine
2016-02-11 15:49:36 -08:00
342ff0d65d
Overlay Network needs Unique Hostname
...
Resolves : #19301
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 3024604054a588f213b671c7f1ec5eed2c99b78a
Component: engine
2016-02-08 15:14:38 -06:00
01f2954590
Docs cleanup for networking features added in v1.10
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 6f863cfa18f30d1df2f1f81b2b4f456dee2a73b8
Component: engine
2016-02-02 06:10:41 -08:00
9cc23f26d7
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
2016-01-28 11:49:07 +08:00
e734434f58
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 >
Upstream-commit: e310d070f498a2ac494c6d3fde0ec5d6e4479e14
Component: engine
2016-01-26 15:58:53 -08:00
d3c651df14
Fix minor doc grammar issues
...
Signed-off-by: Dave Barboza <dxbarboza@gmail.com >
Upstream-commit: f50d0d7fdb11ce36715adfbf857e4668c0fd8f75
Component: engine
2016-01-20 10:52:21 -05:00
819b85bb3a
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 >
Upstream-commit: 5cc672b0061f3df41073cb7b4ff962998a13a09c
Component: engine
2016-01-15 10:03:29 +08:00
082c746378
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
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
bb8be65a6c
Merge pull request #19157 from wenchma/update_build_bridges
...
Update the doc of build-bridges.md
Upstream-commit: 0ed2e26f51f6b82c1b476562c3ae4134c38b26e9
Component: engine
2016-01-14 11:10:37 +01:00
6e46b2fdf4
Docs update for link functionality in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 2aa5f33b20881d3d5e7f412ff946f83f33cde810
Component: engine
2016-01-12 13:38:48 -08:00
e2b2a71502
Merge pull request #18906 from coolljt0725/connect_to_created
...
Support network connect/disconnect to stopped container
Upstream-commit: 301627c677b530a9ea77ecea6d1c82eec83cd9ac
Component: engine
2016-01-12 07:06:31 -08:00
92d4a617b2
Update the doc of build-bridges.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 0ba6a128eeee3f1519fa3842a6847402a7eafa05
Component: engine
2016-01-12 15:52:33 +08:00
3b26d1d1d4
Add docker network connect/disconnect to non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 79d4f0f56ec84922184e25c0263807158b6fb76b
Component: engine
2016-01-11 20:13:39 -05:00
d8dc8b7d33
Docker changes for libnetwork vendoring..
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 64a6dc355815261ac438b12a262e3cda7c9181df
Component: engine
2016-01-08 14:13:55 -08:00
7467c1af44
Allow user to choose the IP address for the container
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 2bb3fc1bc522059e9be5bd967b6a5c49917f5d0c
Component: engine
2016-01-08 10:09:16 -08:00
663db95ac5
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 >
Upstream-commit: f0904affd127ea8bdebfc3f3c586f8eb38e91da5
Component: engine
2015-12-22 13:32:17 -08:00
ba3901d719
Fixing typo reported by @projectvalis
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 55a65e18c08e2612b5cc7384119e6ec44e476da7
Component: engine
2015-12-19 12:47:24 -08:00
a99a73ad6e
Merge pull request #18700 from mqliang/patch-2
...
Update dockernetworks.md
Upstream-commit: 6f930a2ffa57b022947743d6f16751a27b93fbed
Component: engine
2015-12-16 16:58:25 +01:00
b6343dc716
Update dockernetworks.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: f480b7c1f576f033ee276a026a790de415b9bf9c
Component: engine
2015-12-16 15:25:06 +08:00
86c606852c
fix typo in dockerlinks.md
...
fix typo in dockerlinks.md
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: e1f012cf397f170e12443e4993c09171791d37db
Component: engine
2015-12-16 11:21:39 +08:00
22a82ca57b
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
Upstream-commit: 94026969b43fddee3fbf35e5888dee006a14e098
Component: engine
2015-12-12 21:39:34 -08:00
443714c6b5
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 >
Upstream-commit: 76de01c13833e42c89afa7e46d97bb4864a9be9b
Component: engine
2015-12-10 13:24:02 -06:00
f20b52f333
don't try to use default route MTU as bridge MTU
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: fd9d7c02fcc8edd73d056f56f17e5cfe1760495b
Component: engine
2015-12-07 17:32:51 -05:00
cb3375532e
Update the "Manually network" section with detailed info in container-basics
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: a9473772972aefca9b88754c8e4dc98fdee71e92
Component: engine
2015-12-03 22:32:02 +08:00
f2ea55aeff
Add NETWORK_NAME_or_ID value for --net= option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
7073afc49a
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 >
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01: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
6df421c14f
Fixes found by docs validation tool
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 043f447e2e9ecb9d6f34bcee6c11f20f263baf66
Component: engine
2015-11-23 11:19:38 +10:00
60cb2034d2
Merge pull request #17883 from dave-tucker/bug/17709
...
Add required ports for Overlay to docs
Upstream-commit: 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe
Component: engine
2015-11-11 13:10:22 -08:00
5521134e65
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 >
Upstream-commit: f16dceb63233bd2c1fd327b92d7112e8012347ac
Component: engine
2015-11-11 20:31:18 +00:00
f5f4be1acc
Add required ports for Overlay to docs
...
Fixes #17709
Signed-off-by: Dave Tucker <dt@docker.com >
Upstream-commit: 44a527d877faf0ef62bc9b0221f656041833ae66
Component: engine
2015-11-11 18:04:07 +00:00
04e53e786a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
Upstream-commit: 4efe0def0ac2a8b6b74a818d23864f62abfaa521
Component: engine
2015-11-09 15:05:17 -08:00
193b8e63c7
Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
...
Revise commands in Compose section of multi-host quickstart
Upstream-commit: 8aa8d51610f509bbdbbe8409523da575d4907d28
Component: engine
2015-11-06 13:04:43 -08:00
d7b81a07c8
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
Upstream-commit: 3f331eaa4092ff3a612a275351b82b44c778d9fa
Component: engine
2015-11-05 18:33:16 +02:00
51204c03cd
Revise commands in Compose section of multi-host quickstart
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Upstream-commit: 6326e6732dd217ba6c53ba80ba917d72ad0d1ce5
Component: engine
2015-11-04 17:44:01 -08:00
b768870c71
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 >
Upstream-commit: 39dfc536d444df8745124ffa38504241a0a985f7
Component: engine
2015-11-03 08:42:40 -08:00
f259c60206
Fixing ZooKeeper and some other nits Nathan found
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b
Component: engine
2015-11-03 05:34:54 -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
