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

296 commits

Author SHA1 Message Date
Misty Stanley-Jones
9e01221048 Fix menu position of the labels-custom-metadata.md topic 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-29 10:51:08 -07:00
Misty Stanley-Jones
bab64af2ad Merge pull request #26931 from thaJeztah/fix-aux-address-example 
Fix incorrect aux-address examples and test
 2016-09-27 17:06:01 -07:00
Vincent Demeester
64fca34860 Merge pull request #26047 from allencloud/mv-mcvlan-out-of-experimental-docs 
move macvlan out of experimental docs
 2016-09-27 18:45:00 +02:00
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
Misty Stanley-Jones
5c4c062ffc 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>
 2016-09-21 13:20:32 -07:00
Sebastiaan van Stijn
d93a62e9be Merge pull request #26266 from YuPengZTE/dev 
The etc and dot is seprated
 2016-09-17 03:37:00 +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
Sebastiaan van Stijn
0bd281c7cb Merge pull request #26558 from lixiaobing10051267/masterSymbol2 
add bash symbol for docker network inspect
 2016-09-17 03:26:55 +02:00
lixiaobing10051267
7b73b5fd6a fix some incorrect symbols before executing command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-14 22:28:09 +08: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
Charles Smith
6f0502b89b Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
 2016-09-07 10:38:59 -07:00
lixiaobing10051267
97bbfc3534 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 13:19:46 +08:00
lixiaobing10051267
2d1d4684f0 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 11:44:54 +08:00
YuPengZTE
bd914ff5a3 The etc and dot is seprated 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-07 09:02:16 +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
dbdd
30404950c4 add volumes, networks, nodes and services into label doc 
Signed-off-by: dbdd <wangtong2712@gmail.com>
 2016-09-01 20:25:19 +08:00
Charles Smith
1dee308281 some fixes to clean up new plugin system docs 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-30 13:52:13 -07:00
Misty Stanley-Jones
82304abd80 Sanitize uses of Swarm as a proper and improper noun 
Fixes #24905

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-08-30 11:04:41 -07:00
allencloud
6e4ec046f4 move mcvlan out of experimental docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-27 19:18:12 +08:00
yuexiao-wang
530668cb22 Replace docker command from 'docker daemon' to 'dockerd' 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-25 17:04:44 +08:00
Sebastiaan van Stijn
88a6a7763b Merge pull request #25726 from vieux/new_plugin_system_doc 
adding some documentation about the new plugin system
 2016-08-18 17:20:09 +02:00
Johanan Lieberman
086542a687 Update device-mapper-driver.md 
Signed-off-by: Johanan Lieberman <johanan.lieberman@gmail.com>
 2016-08-17 21:58:30 +03:00
Victor Vieux
79aa2b9f6d fix broken link 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-16 21:26:07 -07:00
Akihiro Suda
aab101a770 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>
 2016-08-16 02:13:33 +00:00
Charles Smith
e56dd0e0e7 add overlay networking guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 15:18:21 -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
Sebastiaan van Stijn
4f7b731a26 Remove "-rc" from documentation 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-05 01:38:18 +02:00
Sebastiaan van Stijn
5c9bcaa942 Merge pull request #25358 from lixiaobing10051267/masterBe 
Remove reduntant word in device-mapper-driver.md
 2016-08-03 10:21:39 +02:00
lixiaobing10051267
96c959ec6b Remove reduntant word in device-mapper-driver.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-03 16:13:44 +08:00
Sebastiaan van Stijn
f0230049f0
Update usage of "Swarm" for consistency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-27 23:31:55 +02:00
mapk0y
a94b48923e fix the ipaddress of an explanation. 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2016-07-27 03:17:32 +09:00
allencloud
4e959ef2f7 fix typos 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-07-23 11:32:23 +08: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
Charles Smith
c9e7390115 Merge pull request #24239 from ardnaxelarak/24130_clean_up_docs 
[Docs code snippets] Make it obvious what is command what is result
 2016-07-11 08:26:30 -07:00
Otto Kekäläinen
644a7426cc Fix spelling in comments, strings and documentation 
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
 2016-07-03 20:58:11 +03: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
Antonio Murdaca
a4143e6756 fix warn message typos 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-30 15:17:37 +02:00
Lei Jitang
2aa01e0fbc 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>
 2016-06-30 14:57:46 +08:00
Akihiro Suda
ddf9b6f666 update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-28 06:11:03 +00:00
Sebastiaan van Stijn
563973a183 Merge pull request #23853 from docker/linkchecker-updates 
Removing some url links that can be resolved using src markdown links
 2016-06-23 12:34:45 -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
Sven Dowideit
01f9cbc366 Removing some url links that can be resolved using src markdown links 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2016-06-22 12:50:51 +00:00
Kai Qiang Wu(Kennan)
cbd240581f Fix the missing 'ls' 
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
 2016-06-22 08:40:35 +00:00
Vincent Demeester
96e3f3e2d0 Merge pull request #23757 from AkihiroSuda/overlay2doc 
Add overlay2 description to overlayfs-driver.md
 2016-06-21 14:06:57 +02:00
Kevin Jing Qiu
3b2ee9a704 Fix some doc typos and spacings 
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
 2016-06-20 23:54:36 -07:00
Akihiro Suda
8625adbd67 Add overlay2 description to overlayfs-driver.md 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-06-21 06:18:56 +00:00
Yong Tang
1cb7fb4d2e 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>
 2016-06-19 08:50:13 -07:00