p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,943 Commits 2 Branches 295 Tags
35146fe3594be7aeecbfceb05a897a87f11bf151
Commit Graph

28 Commits

Author SHA1 Message Date
Gaetan de Villele
35146fe359 fix frontmatter keywords value type (string, instead of []string) in /docs/reference 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 572c6bb89a
Component: cli
 2017-06-02 00:10:31 +00:00
Akihiro Suda
5addbf284f add docker network prune 
`docker network prune` prunes unused networks, including overlay ones.
`docker system prune` also prunes unused networks.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8f0be436cd
Component: cli
 2017-06-02 00:10:28 +00:00
lixiaobing10051267
a1672539b7 fix wrong location for network related doc files 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 4865a342fb
Component: cli
 2017-06-02 00:10:26 +00:00
Misty Stanley-Jones
118bce70c4 Sync docker/docker refs with files mistakenly edited in docker.github.io repo 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 7f36c3a1a0
Component: cli
 2017-06-02 00:10:26 +00:00
Misty Stanley-Jones
fbc93c2df5 Convert Markdown frontmatter to YAML 
Some frontmatter such as the weights, menu stuff, etc is no longer used
'draft=true' becomes 'published: false'

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 2845676cc2
Component: cli
 2017-06-02 00:10:24 +00:00
Sebastiaan van Stijn
f5b7d83657 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>
Upstream-commit: 676773a780
Component: cli
 2017-06-02 00:10:12 +00:00
Alessandro Boch
22300ed040 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f9832ceac0
Component: cli
 2017-06-02 00:10:10 +00:00
lixiaobing10051267
70eb7ccb3c provide actual command format for docker network create 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: eb1b81c204
Component: cli
 2017-06-02 00:10:08 +00:00
Charles Smith
10160262f0 add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 32a613412e
Component: cli
 2017-06-02 00:10:05 +00:00
allencloud
0a2537fe3e better command docker network create -h output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: eb0a4426e2
Component: cli
 2017-06-02 00:07:51 +00:00
Arnaud Porterie (icecrime)
d1c6ce2e15 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>
Upstream-commit: 253a5f4ea2
Component: cli
 2017-06-02 00:07:50 +00:00
Alan Thompson
688d1a439b Update network_create.md 
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: bd67dfdd33
Component: cli
 2017-06-02 00:07:47 +00:00
Sebastiaan van Stijn
4b775a7c57 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>
Upstream-commit: bb0afa7381
Component: cli
 2017-06-02 00:07:42 +00:00
Shijiang Wei
744bf7d726 docs: correct network create command 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: d04810fa14
Component: cli
 2017-06-02 00:07:42 +00:00
Harald Albers
759be19a3c docs for labels on build, networks and volumes 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f3f9b34d2a
Component: cli
 2017-06-02 00:07:33 +00:00
Zhang Wei
a81a386a03 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: d219111855
Component: cli
 2017-06-02 00:07:32 +00:00
Aidan Hobson Sayers
bdc79f4953 Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 543ca10394
Component: cli
 2017-06-02 00:07:30 +00:00
Aidan Hobson Sayers
a000a3819f Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 65c94a34be
Component: cli
 2017-06-02 00:07:29 +00:00
Wen Cheng Ma
bbab77622b docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 27686523be
Component: cli
 2017-06-02 00:07:27 +00:00
Ryan Belgrave
6fb9fe70ad Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 82e9cba6d4
Component: cli
 2017-06-02 00:07:24 +00:00
Chun Chen
03fa76c2d2 Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3f5817fdae
Component: cli
 2017-06-02 00:07:23 +00:00
Doug Davis
001436e214 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>
Upstream-commit: 421578fbd4
Component: cli
 2017-06-02 00:07:21 +00:00
Chris Weyl
f15205a41d newtork -> network (minor spelling correction) 
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 66eef79e58
Component: cli
 2017-06-02 00:07:19 +00:00
Mary Anthony
6e6828db93 Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7e68b5f73b
Component: cli
 2017-06-02 00:07:15 +00:00
Mary Anthony
8050e305f6 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>
Upstream-commit: 02a859b9f3
Component: cli
 2017-06-02 00:07:15 +00:00
Mary Anthony
b0b9294f03 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>
Upstream-commit: 4985b20ea1
Component: cli
 2017-06-02 00:07:15 +00:00
Mary Anthony
f33e7e36a6 Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

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

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