Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,818 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

14 Commits

Author SHA1 Message Date
Sebastiaan van Stijn 676773a780 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>
 2017-06-02 00:10:12 +00:00
allencloud eb0a4426e2 better command `docker network create -h` output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-06-02 00:07:51 +00:00
Sebastiaan van Stijn bb0afa7381 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>
 2017-06-02 00:07:42 +00:00
Wen Cheng Ma bdfe7963f2 Update the `docker daemon` to `dockerd` for document 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2017-06-02 00:07:37 +00:00
Harald Albers f3f9b34d2a docs for labels on build, networks and volumes 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-06-02 00:07:33 +00:00
Zhang Wei d219111855 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-06-02 00:07:32 +00:00
Shijiang Wei 4982947250 docs: fix broken links 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2017-06-02 00:07:31 +00:00
Aidan Hobson Sayers 65c94a34be Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2017-06-02 00:07:29 +00:00
Wen Cheng Ma 27686523be docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2017-06-02 00:07:27 +00:00
Ryan Belgrave 82e9cba6d4 Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
 2017-06-02 00:07:24 +00:00
Chun Chen 3f5817fdae Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2017-06-02 00:07:23 +00:00
Chris Weyl 66eef79e58 newtork -> network (minor spelling correction) 
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
 2017-06-02 00:07:19 +00:00
Zhang Wei 1a495e2d47 Fix man pages 
Add contents and fix format problem for man pages.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2017-06-02 00:07:16 +00:00
Mary Anthony 4985b20ea1 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>
 2017-06-02 00:07:15 +00:00