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

23 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
Alessandro Boch f9832ceac0 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-06-02 00:10:10 +00:00
lixiaobing10051267 eb1b81c204 provide actual command format for docker network create 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2017-06-02 00:10:08 +00:00
Charles Smith 32a613412e add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2017-06-02 00:10:05 +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
Arnaud Porterie (icecrime) 253a5f4ea2 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>
 2017-06-02 00:07:50 +00:00
Alan Thompson bd67dfdd33 Update network_create.md 
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2017-06-02 00:07:47 +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
Shijiang Wei d04810fa14 docs: correct network create command 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2017-06-02 00:07:42 +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
Aidan Hobson Sayers 543ca10394 Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2017-06-02 00:07:30 +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
Doug Davis 421578fbd4 remove =false from options that default to false in the docs 
This re-aligns the docs with what the cmd line now does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2017-06-02 00:07:21 +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
Mary Anthony 7e68b5f73b Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
 2017-06-02 00:07:15 +00:00
Mary Anthony 02a859b9f3 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>
 2017-06-02 00:07:15 +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
Mary Anthony d45666f869 Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2017-06-02 00:07:11 +00:00
Madhu Venugopal da80c0929a Networking API and UX documentation 
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-02 00:07:11 +00:00