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

76 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Yong Tang
414b9dea8a Fix a typo in work-with-networks.md 
This fix fixes a typo in the documentation of `work-with-networks.md`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-14 16:58:18 -07:00
Tim Düsterhus
f6ecba1045
Clarify that --ip does not work with IPv6 in docker run 
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
 2016-05-12 23:19:46 +02:00
Wen Cheng Ma
24ec73f754 Update the docker daemon to dockerd for document 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-04-29 09:06:02 +08:00
搏通
9abf304c25 optimise docs 
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
 2016-04-21 09:34:28 +08:00
Vincent Demeester
e764e0215e Merge pull request #22086 from aboch/doc 
Clarify container external connectivity in multi-network scenario
 2016-04-18 18:16:51 +02:00
yorkie
d2c5bf23f1 doc: fix typo 
Signed-off-by: yorkie <yorkiefixer@gmail.com>
 2016-04-18 23:42:33 +08:00
Alessandro Boch
c2e088e134 Clarify container external connectivity in multi-network scenario 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-04-18 08:39:40 -07:00
Alessandro Boch
30859c3456 Update /containers/create remote API docs 
- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-04-12 13:41:13 -07:00
kamjar gerami
a4d4243b91 fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs 
Signed-off-by: kamjar gerami <kami.gerami@gmail.com>
 2016-03-28 17:02:27 +02:00
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