docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
27,766 Commits 12 Branches 295 Tags
2ab4700a6db569d55715bc39cbc91ac0fbfa8d60
Commit Graph

98 Commits

Author SHA1 Message Date
Misty Stanley-Jones
048d1e7728 Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
Upstream-commit: bab64af2ad0d6f5e7c1e9d54b2f6d93096f7b99f
Component: engine
 2016-09-27 17:06:01 -07:00
Vincent Demeester
0b8cdf7c7b Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs 
move macvlan out of experimental docs
Upstream-commit: 64fca3486082cfd59aac32d2cfd9e07b6f62a112
Component: engine
 2016-09-27 18:45:00 +02: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
Sebastiaan van Stijn
ad119a9fca Merge pull request #26413 from lixiaobing10051267/masterLabel 
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
 2016-09-22 02:07:53 +02:00
Sebastiaan van Stijn
6c1fbaf344 Merge pull request #26289 from aboch/doc 
Fix mtu option in documentation
Upstream-commit: 1c117aa8cccd895645e6fb5245bfb4cd11b93ba8
Component: engine
 2016-09-17 03:32:23 +02:00
Sebastiaan van Stijn
8cdc29bdf2 Merge pull request #26558 from lixiaobing10051267/masterSymbol2 
add bash symbol for docker network inspect
Upstream-commit: 0bd281c7cb610baa2b906d7eb42062eeb209b1a9
Component: engine
 2016-09-17 03:26:55 +02:00
lixiaobing10051267
849847f7b2 fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
 2016-09-14 22:28:09 +08:00
lixiaobing10051267
c6ac7292a4 add bash symbol for docker network inspect 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7c3a26db166bf4d618ae414470f6bed7160f1371
Component: engine
 2016-09-14 17:36:48 +08:00
lixiaobing10051267
8a3467d6a3 Labels info ommitted while inspecting self-defined network 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d5fcf57acbc9b77f0b38221d2eb0079be7169904
Component: engine
 2016-09-08 17:27:33 +08:00
Charles Smith
e42ce8aa21 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
 2016-09-07 10:38:59 -07:00
lixiaobing10051267
94b406a933 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 97bbfc353450602b358dfa6231faf240744b9967
Component: engine
 2016-09-07 13:19:46 +08:00
lixiaobing10051267
4de3f43e65 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2d1d4684f0fc752aae7e41af03a0f1589f11ee00
Component: engine
 2016-09-07 11:44:54 +08: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
Charles Smith
458bf87add some fixes to clean up new plugin system docs 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 1dee308281c48a1363fff2433d842fcaa971dce4
Component: engine
 2016-08-30 13:52:13 -07:00
Misty Stanley-Jones
cfe42ec17e Sanitize uses of Swarm as a proper and improper noun 
Fixes #24905

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 82304abd800701e7e211965f5e433804881240e7
Component: engine
 2016-08-30 11:04:41 -07:00
allencloud
097375ead1 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6e4ec046f4a267083b1bd07028d1b68eb248a950
Component: engine
 2016-08-27 19:18:12 +08:00
Victor Vieux
80c9d996e6 fix broken link 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 79aa2b9f6da802ee1380c22c3afc8c0be7c493ce
Component: engine
 2016-08-16 21:26:07 -07:00
Charles Smith
a863701de5 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b
Component: engine
 2016-08-12 15:18:21 -07: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
Lei Jitang
8eacfa50f9 Fix inspect network show gateway with mask 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 096bb5fb0740656b91b3e35f8df23c79270f7f90
Component: engine
 2016-08-11 21:08:54 -04:00
Sebastiaan van Stijn
4183fa25d5 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
 2016-08-05 01:38:18 +02:00
Sebastiaan van Stijn
aa7e6b8845 Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0230049f0afd318217c60ebe486aab3b54538fd
Component: engine
 2016-07-27 23:31:55 +02:00
mapk0y
3bf48fb858 fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
Upstream-commit: a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25
Component: engine
 2016-07-27 03:17:32 +09: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
Kara Alexandra
90002d7a0a Add blanks lines in docs for clarity 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
Upstream-commit: d0737e9ac0bfcbac0e212d157ab305e561eea3ee
Component: engine
 2016-07-01 11:40:22 -07:00
David M. Karr (fullname at gmail.com)
7656eec977 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>
Upstream-commit: a54c3fbb8aa024c477864a0614506da3ea185839
Component: engine
 2016-06-22 09:48:59 -07:00
Kevin Jing Qiu
1555ddd988 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
Upstream-commit: 3b2ee9a704f1e3974dbb9ce857886d5e377580ab
Component: engine
 2016-06-20 23:54:36 -07:00
Victoria Bialas
ce19593c15 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>
Upstream-commit: 8eca8089fa35f652060e86906166dabc42e556f8
Component: engine
 2016-06-13 13:32:30 -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
Yong Tang
45541eb90b 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>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
 2016-05-21 13:19:05 -07:00
Sebastiaan van Stijn
fac63eb804 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>
Upstream-commit: 5fb7f9b29e9a85f36d02c4ecec6c04498fdb4315
Component: engine
 2016-05-18 20:10:31 +02:00
Yong Tang
fb7a3051cb 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>
Upstream-commit: 414b9dea8a1bf7ef7a4b9584dd887c51b49751d4
Component: engine
 2016-05-14 16:58:18 -07:00
Tim Düsterhus
cc4806d5b5 Clarify that --ip does not work with IPv6 in docker run 
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
Upstream-commit: f6ecba104556f4c68b8ad11ee8c2e6b2a27b87ff
Component: engine
 2016-05-12 23:19:46 +02:00
Wen Cheng Ma
79ba4ce6e9 Update the docker daemon to dockerd for document 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 24ec73f754da16e37726a3f1c6a59de508e255fc
Component: engine
 2016-04-29 09:06:02 +08:00
搏通
8c00bd5332 optimise docs 
Signed-off-by: 搏通 <yufeng.pyf@alibaba-inc.com>
Upstream-commit: 9abf304c255cb3194b932e92f2b87bfabaab88c9
Component: engine
 2016-04-21 09:34:28 +08:00
Vincent Demeester
53859297b1 Merge pull request #22086 from aboch/doc 
Clarify container external connectivity in multi-network scenario
Upstream-commit: e764e0215e11da40a1e2148efc9867be362bd2d4
Component: engine
 2016-04-18 18:16:51 +02:00
yorkie
27c9033293 doc: fix typo 
Signed-off-by: yorkie <yorkiefixer@gmail.com>
Upstream-commit: d2c5bf23f16a98ca6f603f7fe2b5a31c70d4c8db
Component: engine
 2016-04-18 23:42:33 +08:00
Alessandro Boch
74a010ee39 Clarify container external connectivity in multi-network scenario 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c2e088e13488904a6747809a689eac5d72a4618e
Component: engine
 2016-04-18 08:39:40 -07:00
Alessandro Boch
8becc1526b 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>
Upstream-commit: 30859c34569b900d3d798ad55f48f3d4fd7dc32c
Component: engine
 2016-04-12 13:41:13 -07:00
kamjar gerami
3002758658 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>
Upstream-commit: a4d4243b9105d03b1e519729e8e8fd4b16084760
Component: engine
 2016-03-28 17:02:27 +02:00
Brent Salisbury
9d333e528b 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>
Upstream-commit: 8926af95e4af4c3f8c6e28d1d054b9b6b7a13ff9
Component: engine
 2016-03-18 18:46:46 -04: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
Brent Salisbury
32fe9a153d docs for experimental vlan net drivers 
Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: 9cb6b51fa24b95789693fa65aa58fe3ad1f36014
Component: engine
 2016-03-11 16:01:01 -08:00
Alan Thompson
6a82bd334a Update dockernetworks.md 
Make command line prompts consistent for both host and container shells.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 65a381ae32d86c4cfe3ae5157e53d16b97b4d64f
Component: engine
 2016-03-03 16:32:24 -08:00
Wen Cheng Ma
ede5a6202a Remove the duplication 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f8f28684f196ff3790ff1c738e81743821fc860
Component: engine
 2016-03-01 17:53:36 +08:00
Vincent Bernat
8bd4c1506d 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>
Upstream-commit: db5ded0dfc28c71276acf8500fabe3c64c15fbe1
Component: engine
 2016-02-25 13:17:26 +01:00
Vincent Demeester
6da923628b Merge pull request #20528 from cloojure/patch-3 
Update dockernetworks.md
Upstream-commit: 3646b14ecd9c07d9d4113b5a36958d3f92484806
Component: engine
 2016-02-20 23:25:51 +01:00
hsinko
d560df1e09 Update configure-dns.md 
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
 2016-02-20 11:51:59 +08:00
Alan Thompson
a4f9e19fdf Update dockernetworks.md 
Fix truncated sentence

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
 2016-02-19 16:57:13 -08:00
Wen Cheng Ma
59be9aceed Fix typo error of dockernetworks.md 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
 2016-02-19 17:18:52 +08:00