p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,960 Commits 2 Branches 295 Tags
478844dff8a836c549f90ea85bc8dd54feaa65cc
Commit Graph

29 Commits

Author SHA1 Message Date
Harald Albers
e1cfecec53 Add docs for docker network create --attachable 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
 2016-12-14 08:39:10 -08:00
Gaetan de Villele
062414bb0e fix frontmatter keywords value type (string, instead of []string) in /docs/reference 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 248c699ec88bb249ce9fd03001d13f29ac0b4b99
Component: engine
 2016-11-03 15:48:30 -07:00
Akihiro Suda
4fb550ce0f 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: 7e24c16086a9a4f38e241e51837f2be4877c04a6
Component: engine
 2016-10-25 06:43:54 +00:00
lixiaobing10051267
f2a96efba0 fix wrong location for network related doc files 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: c0260766588ed4c2c82cca2384d8ae30ac10b362
Component: engine
 2016-10-21 11:27:24 +08:00
Misty Stanley-Jones
b2f3f16f09 Sync docker/docker refs with files mistakenly edited in docker.github.io repo 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 3b36f02c03ec050aa46f9a01cd2d6c60ffd93652
Component: engine
 2016-10-20 10:51:30 -07:00
Misty Stanley-Jones
9fe833df60 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: b30609446d212624e3d4ce814c70130b75c552a0
Component: engine
 2016-10-14 15:44:55 -07:00
Sebastiaan van Stijn
6b1c398ebc 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: fd7161bb3061e2e2f56faed1a4ba1f7a887627bf
Component: engine
 2016-09-27 01:12:29 +02:00
Alessandro Boch
f124e10578 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e74a937b00af567b655c93224cc6a514f54e2b38
Component: engine
 2016-09-02 15:39:49 -07:00
lixiaobing10051267
3dedb3cd52 provide actual command format for docker network create 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 18a9600fb15b057af9d3574210b92cb107eefb24
Component: engine
 2016-08-31 17:40:13 +08:00
Charles Smith
44701ad93a add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: cc5debcb2e8621358721eb860c07f33f8b83d684
Component: engine
 2016-08-12 13:17:24 -07:00
allencloud
cd03aec1cb better command docker network create -h output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d0081a0f476f91b0dc6b28c480e7c95c06b05ebb
Component: engine
 2016-07-16 15:32:17 +08:00
Arnaud Porterie (icecrime)
a4c4731dc9 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: c0c7d5e71586ec8e4d54aef9e061f061e9223cc4
Component: engine
 2016-07-12 13:01:35 -07:00
Alan Thompson
c3e3e8c836 Update network_create.md 
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 68b8cc9735e9f966dd0e7b3b2d56835310100c2a
Component: engine
 2016-07-01 16:16:53 -07:00
Sebastiaan van Stijn
a49a6cbc00 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: feabf71dc1cd5757093c5887b463a6cbcdd83cc2
Component: engine
 2016-06-06 14:20:41 +02:00
Shijiang Wei
f0fedf722a docs: correct network create command 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 041aad6d7200a5b53204d95e9cc5505bf4d201cf
Component: engine
 2016-06-06 13:50:29 +08:00
Harald Albers
779c6aca92 docs for labels on build, networks and volumes 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 995e5beda74b99dfc920f6a79aee977ff5a15a72
Component: engine
 2016-03-25 11:16:19 -07:00
Zhang Wei
2250308978 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ca64269165fb30765d7ea0b0b231674df8da157b
Component: engine
 2016-03-17 16:13:51 +08:00
Aidan Hobson Sayers
13fc2a2541 Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 82d486848dd2e7a0189375a62e8e38171ba9a2b1
Component: engine
 2016-02-23 16:10:54 +00:00
Aidan Hobson Sayers
7f66344ec0 Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: d736a9d2c3758fcc4eac0b62e9c7b128388021c1
Component: engine
 2016-02-12 01:42:15 +00:00
Wen Cheng Ma
9cc23f26d7 docs: document options for default network driver 
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: ebd1f70165faf1c19325f930b866365cab8e765b
Component: engine
 2016-01-28 11:49:07 +08:00
Ryan Belgrave
f8714c52f0 Add IPAM Config Options to match libnetwork 
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 662cac08ef83ee105addb4d29f6e46188468306f
Component: engine
 2016-01-14 14:32:25 -05:00
Chun Chen
9c6798de6b Add network interal mode 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b70954e60a15d09756bd6b00a6fadedc64829477
Component: engine
 2016-01-13 11:30:36 -05:00
Doug Davis
743bbc7202 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: e6115a6c1c02768898b0a47e550e6c67b433c436
Component: engine
 2015-12-23 07:11:35 -08:00
Chris Weyl
d0c344304f newtork -> network (minor spelling correction) 
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 8fd2630d01d65dd64053091ef9b35a98f4fc3d5c
Component: engine
 2015-12-01 15:26:36 -06:00
Mary Anthony
f259c60206 Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b
Component: engine
 2015-11-03 05:34:54 -08:00
Mary Anthony
ecd671294f 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: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
 2015-11-02 21:14:55 -08:00
Mary Anthony
00621ae8e2 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: d5364c71140208e1b861625e6394a5623e878e34
Component: engine
 2015-10-27 08:29:07 -07:00
Mary Anthony
92bcbdcb5f Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b44ef2b306c56dad16500c3738b0f29ec0f34635
Component: engine
 2015-10-08 09:28:46 -07:00
Madhu Venugopal
af07841b68 Networking API and UX documentation 
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
 2015-10-07 03:54:27 -07:00