0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27756 commits 14 branches 412 tags 338 MiB
Commit graph

35 commits

Author SHA1 Message Date
Sebastiaan van Stijn
fd7161bb30
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>
 2016-09-27 01:12:29 +02:00
Sebastiaan van Stijn
c5f4a1ab19 Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
 2016-09-22 02:07:53 +02:00
Sebastiaan van Stijn
1c117aa8cc Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
 2016-09-17 03:32:23 +02:00
lixiaobing10051267
7c3a26db16 add bash symbol for docker network inspect 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 17:36:48 +08:00
lixiaobing10051267
d5fcf57acb Labels info ommitted while inspecting self-defined network 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-08 17:27:33 +08:00
Alessandro Boch
e74a937b00 Fix mtu option in documentation 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-09-02 15:39:49 -07:00
Charles Smith
cc5debcb2e add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 13:17:24 -07:00
Lei Jitang
096bb5fb07 Fix inspect network show gateway with mask 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-08-11 21:08:54 -04:00
Arnaud Porterie (icecrime)
c0c7d5e715
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>
 2016-07-12 13:01:35 -07:00
Kara Alexandra
d0737e9ac0 Add blanks lines in docs for clarity 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
 2016-07-01 11:40:22 -07:00
David M. Karr (fullname at gmail.com)
a54c3fbb8a Update work-with-networks.md 
The value of the Subnet and Gateway properties didn't match the command-line argument.

Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
 2016-06-22 09:48:59 -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
Yong Tang
414b9dea8a Fix a typo in work-with-networks.md 
This fix fixes a typo in the documentation of `work-with-networks.md`.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-14 16:58:18 -07:00
Tim Düsterhus
f6ecba1045
Clarify that --ip does not work with IPv6 in docker run 
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
 2016-05-12 23:19:46 +02:00
Wen Cheng Ma
24ec73f754 Update the docker daemon to dockerd for document 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-04-29 09:06:02 +08:00
kamjar gerami
a4d4243b91 fixes-#21581-no--subnetwork-option-as-specified-in-docs-for-work-with-networks.md: fixed typo in docs 
Signed-off-by: kamjar gerami <kami.gerami@gmail.com>
 2016-03-28 17:02:27 +02:00
Zhang Wei
ca64269165 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-17 16:13:51 +08:00
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
Roland Huß
03b25e024e Fix some formatting 
* Codified example container names
* Emphasised 'link' vs 'legacy link' (instead of using code markup)
* Add a missing ``` for a code example

Signed-off-by: Roland Huß <roland@jolokia.org>
 2016-02-12 10:34:55 +01: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
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Madhu Venugopal
6f863cfa18 Docs cleanup for networking features added in v1.10 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-02-02 06:10:41 -08: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
Wen Cheng Ma
5cc672b006 Add Subnets info for user-defined network 
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-15 10:03:29 +08:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias 
Network scoped alias support
 2016-01-14 10:58:51 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-14 08:44:41 -08:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect 
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-01-14 22:33:41 +08:00
Madhu Venugopal
2aa5f33b20 Docs update for link functionality in user-defined networks 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-12 13:38:48 -08:00
Sebastiaan van Stijn
301627c677 Merge pull request #18906 from coolljt0725/connect_to_created 
Support network connect/disconnect to stopped container
 2016-01-12 07:06:31 -08:00
Lei Jitang
79d4f0f56e Add docker network connect/disconnect to non-running container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-11 20:13:39 -05:00
Santhosh Manohar
64a6dc3558 Docker changes for libnetwork vendoring.. 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-01-08 14:13:55 -08:00
Alessandro Boch
2bb3fc1bc5 Allow user to choose the IP address for the container 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-08 10:09:16 -08:00
Wen Cheng Ma
4d66f18be0 Correct some typos for docs 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2015-11-24 15:14:32 +08: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