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

14 commits

Author SHA1 Message Date
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
allencloud
d0081a0f47 better command docker network create -h output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-16 15:32:17 +08: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
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
Harald Albers
995e5beda7 docs for labels on build, networks and volumes 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-03-25 11:16:19 -07:00
Zhang Wei
ca64269165 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-17 16:13:51 +08:00
Shijiang Wei
36506b7944 docs: fix broken links 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-03-12 21:24:55 +08: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
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
Ryan Belgrave
662cac08ef Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2016-01-14 14:32:25 -05:00
Chun Chen
b70954e60a Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-13 11:30:36 -05:00
Chris Weyl
8fd2630d01
newtork -> network (minor spelling correction) 
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
 2015-12-01 15:26:36 -06:00
Zhang Wei
d790469681 Fix man pages 
Add contents and fix format problem for man pages.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-10 09:33:55 +08:00
Mary Anthony
d5364c7114 Updating network commands: adding man pages 
Adding Related information blocks
Final first draft pass: ready for review
Review comments
Entering comments from the gang
Updating connect to include paused

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-27 08:29:07 -07:00