p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,623 Commits 2 Branches 295 Tags
64cc662c76a33fee33c2eb892f2c00a080c04916
Commit Graph

295 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
Misty Stanley-Jones
1f178ade70 Restructure content about Docker object labels 
A few points of work:

- Took the topic out of the left-hand nav and made it
  reachable from the User guide intro

- Condensed the topic's contents, presenting only conceptual
  info and pointing instead to the command-line references
  for each type of object

- Added brief information about the `LABELS` keyword to the
  Dockerfile reference

A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd
Component: engine
 2016-09-21 13:20:32 -07:00
Sebastiaan van Stijn
32dd641688 Merge pull request #26266 from YuPengZTE/dev 
The etc and dot is seprated
Upstream-commit: d93a62e9bef374ff501f155583e707c1ae77926b
Component: engine
 2016-09-17 03:37:00 +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
YuPengZTE
297af6f7a7 The etc and dot is seprated 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Upstream-commit: bd914ff5a31b1b39bdd9c0fbacf76c65c2b1e842
Component: engine
 2016-09-07 09:02:16 +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
dbdd
7a15c4b5ad add volumes, networks, nodes and services into label doc 
Signed-off-by: dbdd <wangtong2712@gmail.com>
Upstream-commit: 30404950c49986291c02e1f9e6f0fce3cb54e09b
Component: engine
 2016-09-01 20:25:19 +08: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
yuexiao-wang
c65cef03da Replace docker command from 'docker daemon' to 'dockerd' 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 530668cb2262fc89e60a23d9a0f6555498b0171b
Component: engine
 2016-08-25 17:04:44 +08:00
Sebastiaan van Stijn
9c61498be3 Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
Upstream-commit: 88a6a7763b789a35fff9df4e52e48ca99afd3c08
Component: engine
 2016-08-18 17:20:09 +02:00
Johanan Lieberman
3497960ec5 Update device-mapper-driver.md 
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com>
Upstream-commit: 086542a687235b0c3c8a6985755b918e2e93fcbc
Component: engine
 2016-08-17 21:58:30 +03: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
Akihiro Suda
871f085a91 Add a note about the open(2) and rename(2) on AUFS and OverlayFS 
Close #25409
Update #10180

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: aab101a770a88cdbde5012dc7eb5b4439cf57192
Component: engine
 2016-08-16 02:13:33 +00: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
e2da5928d4 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
Upstream-commit: 5c9bcaa9421699eb39df59cf12f9404bd4ebec82
Component: engine
 2016-08-03 10:21:39 +02:00
lixiaobing10051267
8c12ea3017 Remove reduntant word in device-mapper-driver.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 96c959ec6b80ff11c8dc8f6d9105b19b9c80899a
Component: engine
 2016-08-03 16:13:44 +08: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
allencloud
1c3431e16a fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4e959ef2f7f063803d04e06166f459257eb94b5c
Component: engine
 2016-07-23 11:32:23 +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
Charles Smith
a7e56d2212 Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs 
[Docs code snippets] Make it obvious what is command what is result
Upstream-commit: c9e739011574f3b3fb0a1f450e69304b6dbdabf6
Component: engine
 2016-07-11 08:26:30 -07:00
Otto Kekäläinen
0bdbf282f3 Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 644a7426cc31c338fedb6574d2b88d1cc2f43a08
Component: engine
 2016-07-03 20:58:11 +03: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
Antonio Murdaca
169947bdeb fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a4143e6756d697323d560396dff6b90168a1e56c
Component: engine
 2016-06-30 15:17:37 +02:00
Lei Jitang
ac805da5d2 Remove dm.no_warn_on_loop_devices in info warning 
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2aa01e0fbc76ecb8cf1a1b608e254e6cb8821ff7
Component: engine
 2016-06-30 14:57:46 +08:00
Akihiro Suda
28815bb149 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: ddf9b6f6666d501bc408bdf8cdc4feb10db287ed
Component: engine
 2016-06-28 06:11:03 +00:00
Sebastiaan van Stijn
7c1b9df9b0 Merge pull request #23853 from docker/linkchecker-updates 
Removing some url links that can be resolved using src markdown links
Upstream-commit: 563973a183bc100e78688f3b5e7b2244c341700a
Component: engine
 2016-06-23 12:34:45 -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
Sven Dowideit
9bfdf60ca3 Removing some url links that can be resolved using src markdown links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 01f9cbc3663cf134ca427e4f8b98bba637f6655e
Component: engine
 2016-06-22 12:50:51 +00:00
Kai Qiang Wu(Kennan)
425fb8faf5 Fix the missing 'ls' 
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
Upstream-commit: cbd240581f274c3599efb1c43b01cb61607c79d0
Component: engine
 2016-06-22 08:40:35 +00:00
Vincent Demeester
75f31f238e Merge pull request #23757 from AkihiroSuda/overlay2doc 
Add overlay2 description to overlayfs-driver.md
Upstream-commit: 96e3f3e2d040c0b5120efd5bee994b13d44f8087
Component: engine
 2016-06-21 14:06:57 +02: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
Akihiro Suda
b721dee70b Add overlay2 description to overlayfs-driver.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 8625adbd67f08f2da7816d0ce9d2e9267f7a4f6b
Component: engine
 2016-06-21 06:18:56 +00:00
Yong Tang
f1b4ff8de1 Fix reference link error in Jenkins docs failure 
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/

There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1cb7fb4d2e53c0f9c709cddc1339958b18e619fa
Component: engine
 2016-06-19 08:50:13 -07:00
Sven Dowideit
e7f24f4bb5 href links are not converted from file.md by hugo 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ad1819ca1d56a0e2caae2f0f28d14a456686e00b
Component: engine
 2016-06-18 12:44:38 +00:00