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

91 Commits

Author SHA1 Message Date
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
allencloud
c93303b8d7 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 6e4ec046f4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:28:35 +02:00
lixiaobing10051267
f9f6145003 add bash symbol for docker network inspect 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 7c3a26db16)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:24:55 +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
lixiaobing10051267
bc97dc1e50 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit 2d1d4684f0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-29 14:16:46 +02:00
Sebastiaan van Stijn
99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble 
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-16 10:03:13 -07:00
Charles Smith
dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-09 14:44:29 -07:00
Sven Dowideit
be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates 
2016.09.08 engine docs updates
 2016-09-09 21:43:38 +10:00
Vincent Demeester
c63cdcd948 Merge pull request #26362 from lixiaobing10051267/masterIfconfig 
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-08 14:34:00 -07:00
Vincent Demeester
9c2b789caf Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs 
some fixes to clean up new plugin system docs
(cherry picked from commit c1b82df740)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:35:22 -07:00
Sebastiaan van Stijn
909f9f5ea8 Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
(cherry picked from commit 88a6a7763b)

Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 11:02:11 -07:00
Charles Smith
4534b9e6c3 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e56dd0e0e7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 23:21:59 +02: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
Sebastiaan van Stijn
798e0b07cb Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f0230049f0)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 17:56:43 -07:00
Sebastiaan van Stijn
4b9b07f281 Merge pull request #25425 from thaJeztah/remove-rc-suffix 
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48)

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 16:32:22 -07:00
mapk0y
b7e1ea51a0 fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
(cherry picked from commit a94b48923e)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-07-27 20:40:26 +10: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
Kara Alexandra
e0960bd8e7 Add blanks lines in docs for clarity 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
(cherry picked from commit d0737e9ac0)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-12 15:43:39 -07:00
David M. Karr (fullname at gmail.com)
6de8049ab5 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>
(cherry picked from commit a54c3fbb8a)
 2016-06-30 16:47:46 -07:00
Kevin Jing Qiu
c7d35daad8 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704)
 2016-06-30 16:47:40 -07:00
Victoria Bialas
8eca8089fa surfacing Learn by example topics to top level of Docker Engine docs 
fixing links after moving surfacing tutorials

fixing more links for the newly located tutorials

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-06-13 13:32:30 -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
55b1724018 Fix a typos in docs of networking guide 
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-05-21 13:19:05 -07:00
Sebastiaan van Stijn
5fb7f9b29e Suppress "IPv4 forwarding" warning for --net=host 
Containers using the host network stack (--net=host)
are not affected by "ip-forwarding" being disabled,
so there's not need to show a warning.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-05-18 20:10:31 +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
搏通
9abf304c25 optimise docs 
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
 2016-04-21 09:34:28 +08:00
Vincent Demeester
e764e0215e Merge pull request #22086 from aboch/doc 
Clarify container external connectivity in multi-network scenario
 2016-04-18 18:16:51 +02:00
yorkie
d2c5bf23f1 doc: fix typo 
Signed-off-by: yorkie <yorkiefixer@gmail.com>
 2016-04-18 23:42:33 +08:00
Alessandro Boch
c2e088e134 Clarify container external connectivity in multi-network scenario 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-04-18 08:39:40 -07:00
Alessandro Boch
30859c3456 Update /containers/create remote API docs 
- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-04-12 13:41:13 -07: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
Brent Salisbury
8926af95e4 Updates to macvlan/ipvlan experimental docs 
- Added a few more diagrams.
- Fixed typos and a few additional  details.
- Moved experimental images to a new directory
  in /experimental/images per @cpuguy83 suggestion.

Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-03-18 18:46:46 -04:00
Zhang Wei
ca64269165 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-03-17 16:13:51 +08:00
Brent Salisbury
9cb6b51fa2 docs for experimental vlan net drivers 
Signed-off-by: Brent Salisbury <brent@docker.com>
 2016-03-11 16:01:01 -08:00
Alan Thompson
65a381ae32 Update dockernetworks.md 
Make command line prompts consistent for both host and container shells.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-03-03 16:32:24 -08:00
Wen Cheng Ma
9f8f28684f Remove the duplication 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-03-01 17:53:36 +08:00
Vincent Bernat
db5ded0dfc docs: simplify some steps of the overlay network guide 
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
 2016-02-25 13:17:26 +01:00
Vincent Demeester
3646b14ecd Merge pull request #20528 from cloojure/patch-3 
Update dockernetworks.md
 2016-02-20 23:25:51 +01:00
hsinko
0b64280195 Update configure-dns.md 
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
 2016-02-20 11:51:59 +08:00
Alan Thompson
549fa67dae Update dockernetworks.md 
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
 2016-02-19 16:57:13 -08:00
Wen Cheng Ma
f03050cc4c Fix typo error of dockernetworks.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
 2016-02-19 17:18:52 +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
Sebastiaan van Stijn
7da5784b10 Fix documentation typos 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-02-15 15:46:56 +01:00
David Calavera
b734d0e8cc Merge pull request #20285 from moxiegirl/fix-user-guide 
Update the userguide to fix user feedback
 2016-02-12 11:07:03 -08:00
Mary Anthony
bf76b1d686 Update the userguide to fix user feedback 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-12 10:08:59 -08:00
David Calavera
3a3c953806 Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options 
Fix an erratum; s/two/three/
 2016-02-12 09:58:48 -08:00
Yi EungJun
8c93958fcb Fix an erratum; s/two/three/ 
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
 2016-02-13 00:14:35 +09: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