dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-04 15:11:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,010 Commits 19 Branches 591 Tags
1.12.x
Commit Graph

24 Commits

Author SHA1 Message Date
Misty Stanley-Jones
cf60af87f9 Formatting changes to make 1.12.x ref docs buildable in Jekyll 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-09 13:07:24 -08:00
Sebastiaan van Stijn
ca474f7808 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>
(cherry picked from commit fd7161bb30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:52 +02:00
Alessandro Boch
e289fc155a Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit e74a937b00)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:46 +02:00
Vincent Demeester
1e9fb2f18e Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate 
provide actual command format for docker network create
(cherry picked from commit 37fd1416da)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 12:17:10 -07:00
Charles Smith
3da4ac64af add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit cc5debcb2e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02:00
allencloud
5fcac2cdfd better command docker network create -h output 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit d0081a0f47)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:15:24 -07:00
Arnaud Porterie (icecrime)
c61fa33c23 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>
(cherry picked from commit c0c7d5e715)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-12 15:50:38 -07:00
Alan Thompson
5c9db19be0 Update network_create.md 
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
(cherry picked from commit 68b8cc9735)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-08 15:31:23 -07: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
Shijiang Wei
041aad6d72 docs: correct network create command 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-06-06 13:50:29 +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
Aidan Hobson Sayers
82d486848d Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-23 16:10:54 +00: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
Doug Davis
e6115a6c1c 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>
 2015-12-23 07:11:35 -08: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
Mary Anthony
0f1083c8da Fixing ZooKeeper and some other nits Nathan found 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-11-03 05:34:54 -08:00
Mary Anthony
9ef855f9e5 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>
 2015-11-02 21:14: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
Mary Anthony
b44ef2b306 Fixing issues in command ordering. Adding index.md 
Adjust bullets
Entering Seb's comments

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

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