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

98 commits

Author SHA1 Message Date
Misty Stanley-Jones
bab64af2ad Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
 2016-09-27 17:06:01 -07:00
Vincent Demeester
64fca34860 Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs 
move macvlan out of experimental docs
 2016-09-27 18:45:00 +02:00
Sebastiaan van Stijn
fd7161bb30
Fix incorrect aux-address examples and test 
The (host)name for aux-addresses should
be unique, otherwise later values overwrite
earlier values.

Before this change, the example command
would send this API request;

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "a": "192.170.1.5",
              "b": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

After this change, the request looks
like this (all aux-addresses preserved);

    {
      "Attachable": false,
      "CheckDuplicate": true,
      "Driver": "overlay",
      "EnableIPv6": false,
      "IPAM": {
        "Config": [
          {
            "AuxiliaryAddresses": {
              "my-router": "192.168.1.5",
              "my-switch": "192.168.1.6"
            },
            "Gateway": "192.168.0.100",
            "IPRange": "192.168.1.0/24",
            "Subnet": "192.168.0.0/16"
          },
          {
            "AuxiliaryAddresses": {
              "my-printer": "192.170.1.5",
              "my-nas": "192.170.1.6"
            },
            "Gateway": "192.170.0.100",
            "Subnet": "192.170.0.0/16"
          }
        ],
        "Driver": "default",
        "Options": {
        }
      },
      "Internal": false,
      "Labels": {
      },
      "Name": "my-multihost-network",
      "Options": {
      }
    }

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
c5f4a1ab19 Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
 2016-09-22 02:07:53 +02:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
 2016-09-17 03:32:23 +02:00
Sebastiaan van Stijn
0bd281c7cb Merge pull request #26558 from lixiaobing10051267/masterSymbol2 
add bash symbol for docker network inspect
 2016-09-17 03:26:55 +02:00
lixiaobing10051267
7b73b5fd6a fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 22:28:09 +08:00
lixiaobing10051267
7c3a26db16 add bash symbol for docker network inspect 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 17:36:48 +08:00
lixiaobing10051267
d5fcf57acb Labels info ommitted while inspecting self-defined network 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-08 17:27:33 +08:00
Charles Smith
6f0502b89b Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
 2016-09-07 10:38:59 -07:00
lixiaobing10051267
97bbfc3534 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 13:19:46 +08:00
lixiaobing10051267
2d1d4684f0 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 11:44:54 +08:00
Alessandro Boch
e74a937b00 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-09-02 15:39:49 -07:00
Charles Smith
1dee308281 some fixes to clean up new plugin system docs 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-30 13:52:13 -07:00
Misty Stanley-Jones
82304abd80 Sanitize uses of Swarm as a proper and improper noun 
Fixes #24905

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-08-30 11:04:41 -07:00
allencloud
6e4ec046f4 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-27 19:18:12 +08:00
Victor Vieux
79aa2b9f6d fix broken link 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-16 21:26:07 -07:00
Charles Smith
e56dd0e0e7 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 15:18:21 -07:00
Charles Smith
cc5debcb2e add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 13:17:24 -07:00
Lei Jitang
096bb5fb07 Fix inspect network show gateway with mask 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-08-11 21:08:54 -04:00
Sebastiaan van Stijn
4f7b731a26 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 01:38:18 +02:00
Sebastiaan van Stijn
f0230049f0
Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-27 23:31:55 +02:00
mapk0y
a94b48923e fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2016-07-27 03:17:32 +09:00
Arnaud Porterie (icecrime)
c0c7d5e715
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>
 2016-07-12 13:01:35 -07:00
Kara Alexandra
d0737e9ac0 Add blanks lines in docs for clarity 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
 2016-07-01 11:40:22 -07:00
David M. Karr (fullname at gmail.com)
a54c3fbb8a 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>
 2016-06-22 09:48:59 -07:00
Kevin Jing Qiu
3b2ee9a704 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
 2016-06-20 23:54:36 -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