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

27457 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
eb3a01eb43 Add --mount syntax documentation to CLI reference 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-19 11:56:59 +02:00
Sebastiaan van Stijn
1ccd79e1a9 Merge pull request #26682 from yuexiao-wang/fix-typo 
Fix typo for docs reference
 2016-09-19 11:14:46 +02:00
Sebastiaan van Stijn
abd02a9ba0 Merge pull request #26691 from YuPengZTE/devSUSE 
Add prompt of $
 2016-09-19 10:45:23 +02:00
Akihiro Suda
69f00a137c Fix a race in libcontainerd/pausemonitor_linux.go 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-19 07:42:21 +00:00
YuPengZTE
638546d120 Add prompt of $ 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-19 10:46:25 +08:00
Brian Goff
45a8f68026 Merge pull request #26616 from tonistiigi/id-digest 
Generalize content addressable and reference storage
 2016-09-18 09:40:16 -04:00
Brian Goff
bc60f5af84 Merge pull request #26650 from Microsoft/jjh/firststart 
Windows: OCI remove first start
 2016-09-18 09:27:10 -04:00
Brian Goff
112ba3637d Merge pull request #26578 from Microsoft/jjh/ociuser 
Windows: Unify OCI user struct
 2016-09-18 09:20:45 -04:00
Brian Goff
fcf77620d6 Merge pull request #26675 from pestophagous/fix-typo-understanding-docker 
Fix typo in docs. s/methodoligies/methodologies/
 2016-09-18 09:09:40 -04:00
Sebastiaan van Stijn
1444401b16 Merge pull request #26678 from YuPengZTE/devSUDO 
Add bash symbol for sudo
 2016-09-18 13:36:13 +02:00
Boaz Shuster
96622b2a7d Add the format switch to the stats command 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-09-18 14:16:13 +03:00
yuexiao-wang
0f0b0db842 fix typo for docs reference 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-18 11:00:19 +08:00
Alexander Morozov
beea4d93dc Merge pull request #26676 from Microsoft/jjh/tp5graphdriver 
Windows: Remove TP5 hack from graphdriver
 2016-09-17 19:54:58 -07:00
YuPengZTE
ced2729841 The hit is missed 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-09-18 09:38:20 +08:00
John Howard
56952e2159 Merge pull request #26662 from WeiZhang555/fix-flaky-unit-test 
Fix flaky unit test
 2016-09-17 18:32:11 -07:00
John Howard
f61315f0df Windows: Remove TP5 hack from graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-17 16:16:50 -07:00
pestophagous
191adcfb63
Fix typo in docs. s/methodoligies/methodologies/ 
Signed-off-by: K Heller <pestophagous@gmail.com>
 2016-09-17 15:37:03 -07:00
Alexander Morozov
0589358eec Merge pull request #26669 from cpuguy83/vendor_syslog 
re-vendor syslog package
 2016-09-17 10:27:21 -07:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Brian Goff
f528690674 re-vendor syslog package 
Fixes #26394

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-09-17 10:25:05 -04:00
Sebastiaan van Stijn
788a8a3cac Merge pull request #26634 from thaJeztah/fix-api-docs-for-services 
Fix service and tasks API documentation
 2016-09-17 16:13:15 +02:00
Sebastiaan van Stijn
1fb556bb7e Merge pull request #26654 from thaJeztah/sync-api-docs 
Synchronize API docs
 2016-09-17 16:11:42 +02:00
Vincent Demeester
e54171378c Merge pull request #26656 from miaoyq/rename-name-to-destination 
Rename the variable 'name' to 'destination'
 2016-09-17 16:01:02 +02:00
Vincent Demeester
5d7b725071 Merge pull request #26606 from dnephin/move_errors 
Move errors package to api/errors
 2016-09-17 16:00:38 +02:00
Vincent Demeester
1d8ad2974e Merge pull request #26643 from allencloud/validate-two-service-modes-in-request 
return err when both two service modes in request
 2016-09-17 15:50:55 +02:00
Brian Goff
6d8598f4bb Merge pull request #26649 from dperny/add-comment-to-endpointspec 
Added comments to PortConfig for greater clarity
 2016-09-17 08:16:32 -04:00
Brian Goff
3548356957 Merge pull request #26555 from miaoyq/refactor-aufsMount 
refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
 2016-09-17 08:04:18 -04:00
Sebastiaan van Stijn
2f5b379192 Merge pull request #26653 from thaJeztah/move-mounts-to-correct-api-version 
Move HostConfig.Mounts to correct API version
 2016-09-17 13:53:37 +02:00
Zhang Wei
bc5768733d Fix flaky unit test 
Fix flaky test `TestHTTPTimeout` caused by precision problem.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-17 19:40:58 +08:00
allencloud
c413d4177b return err when both two service mode in request 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-17 19:04:46 +08:00
Yanqiang Miao
57cec5a777 Rename the variable 'name' to 'destination' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-09-17 10:52:11 +08: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
30839b0688 Merge pull request #26540 from sfsmithcha/remove_charles_from_maintainers 
removes sfsmithcha from maintainers
 2016-09-17 03:28: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
Sebastiaan van Stijn
258fa6c23f Merge pull request #26557 from schmunk42/patch-1 
fix typo
 2016-09-17 03:26:11 +02:00
Sebastiaan van Stijn
53b1dcb25c
Synchronize API docs 
This synchronizes changes between API versions, and:

- applies e0a552504e to
  older versions of the documentation
- applies a2a0a03e2b to
  API version 1.25
- syncs some minor differences

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 03:02:12 +02:00
Sebastiaan van Stijn
cd73ceffd8
Move HostConfig.Mounts to correct API version 
This was added in fc7b904dce,
but some parts of the documentation ended up in the
wrong API version, and was overlooked during
review :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 02:36:07 +02:00
Sebastiaan van Stijn
d69409fd43
Fix service and tasks API documentation 
The documentation contained some outdated information
on these endpoints.

This change fixes those parts of the documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-09-17 02:29:38 +02:00
John Howard
f7fd408ba7 Windows: OCI remove first start 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 16:05:55 -07:00
Drew Erny
55454752f8 Added comments to PortConfig for greater clarity 
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2016-09-16 14:47:35 -07:00
Sebastiaan van Stijn
94bc2b1bc0 Merge pull request #26387 from Microsoft/jjh/securityopts 
Only output security options if there are any
 2016-09-16 23:05:30 +02:00
Doug Davis
61639bf63d Merge pull request #26647 from jbodah/patch-1 
Remove extra paren in `run --link` docs
 2016-09-16 21:38:17 +02:00
Josh Bodah
484fbe236d Remove extra paren in run --link docs 
Signed-off-by: Josh Bodah <jb3689@yahoo.com>
 2016-09-16 15:32:12 -04:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
Vincent Demeester
8a7006ff8e Merge pull request #26620 from runcom/fix-docs 
docs: reference: api: clarify pull all tags
 2016-09-16 20:56:04 +02:00
Michael Crosby
efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements 
Splunk Logging Driver performance improvements
 2016-09-16 10:22:09 -07:00
John Howard
dd3d223a7e Only output security options if there are any 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 10:05:21 -07:00
Daniel Nephin
bcb0405239 Use apiError in server version middleware. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-16 12:27:14 -04:00
Daniel Nephin
c452e1bfe6 Move errors/ to api/errors 
Using:
        gomvpkg -from github.com/docker/docker/errors
                -to github.com/docker/docker/api/errors
                -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-16 12:27:13 -04:00