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

29957 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anusha Ragunathan
d25186a625 Merge pull request #29664 from cpuguy83/fix_bolt_usage 
Fix usage of boltdb in volume restore
 2016-12-22 13:53:04 -08:00
Anusha Ragunathan
e4512d2647 Merge pull request #29665 from mavenugo/getall 
Add a GetAll function that returns only managed plugins supported by V2
 2016-12-22 13:30:28 -08:00
Sebastiaan van Stijn
b39b0c4596 Merge pull request #29615 from londoncalling/docs-glossary-followup-PR#29561 
followup to incorporate review comments per previous reviews on PR#29561
 2016-12-22 21:50:58 +01:00
Brian Goff
748a9a3f9c Merge pull request #29628 from liliVicky/my-feature4 
modify some errors of plurality
 2016-12-22 15:40:30 -05:00
Victoria Bialas
15a21ef1bd followup to incorporate review comments per previous reviews on PR#29561 
incorporated review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-12-22 12:30:53 -08:00
Madhu Venugopal
8f1b793528 Add a GetAll function that returns only managed plugins supported by V2 
The current GetAll handles both V2 and legacy plugins. Also due to the
nature of V1 plugins, it also loads them. This causes problems when
loading is not required. Hence adding an independent API that will
return only the plugins that are loaded using v2 mangaed plugins.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-12-22 10:26:04 -08:00
Brian Goff
4876a9047e Fix usage of boltdb in volume restore 
bolt k/v pairs are only valid for the life of a transaction.
This means the memory that the k/v pair is referencing may be invalid if
it is accessed outside of the transaction.
This can potentially cause a panic.

For reference: https://godoc.org/github.com/boltdb/bolt#hdr-Caveats

To fix this issue, unmarshal the stored data into volume meta before
closing the transaction.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-12-22 11:56:02 -05:00
Sebastiaan van Stijn
a8bcef6fdd Merge pull request #29500 from WeiZhang555/add-missing-flag 
Add missing "--default-runtime" flag in manpage
 2016-12-22 16:22:53 +01:00
Zhang Wei
977fd43985 Add missing "--default-runtime" flag in manpage 
Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-12-22 23:00:40 +08:00
Sebastiaan van Stijn
b9ee31ae02 Merge pull request #29314 from vdemeester/no-more-utils 
Remove the utils package
 2016-12-22 15:21:05 +01:00
Vincent Demeester
524704143b Merge pull request #29600 from allencloud/update-docs-about-service-update 
update service update in docs
 2016-12-22 15:17:51 +01:00
Vincent Demeester
0ca3e84227 Merge pull request #29603 from mstanleyjones/docker_diff_improvements 
Clarify what docker diff shows
 2016-12-22 15:15:01 +01:00
Vincent Demeester
b47cb6095d Merge pull request #29532 from yuexiao-wang/add-link-swarm 
Add the link for swarm reference document
 2016-12-22 15:13:47 +01:00
Vincent Demeester
8f9a48ab5a Merge pull request #29565 from yuexiao-wang/fix-typo-tls 
Change tls to TLS
 2016-12-22 12:10:09 +01:00
Sebastiaan van Stijn
d34e846960 Merge pull request #29399 from Mashimiao/oci-namespace-remove-idx 
oci/namespace: remove unnecessary variable idx
 2016-12-22 10:50:06 +01:00
Vincent Demeester
f847a3b7ce Merge pull request #29483 from vdemeester/extract-and-refactor-requirement 
[test-integration] Refactor and extract TestRequire functionality
 2016-12-22 10:24:51 +01:00
Vincent Demeester
9b5484e8c7 Merge pull request #29536 from vdemeester/integration-privateRegistryURL-const 
[test-integration] Make privateRegistryURL (and dockerd) constant
 2016-12-22 10:23:35 +01:00
Vincent Demeester
6b94be3521 Merge pull request #29605 from cpuguy83/fix_container_list 
Refactor cleanup of paused test containers
 2016-12-22 10:22:58 +01:00
Vincent Demeester
176ef97a98 Merge pull request #29645 from alexellis/label_arm_issues 
Label ARM issues through Poule #29644
 2016-12-22 10:21:08 +01:00
Ma Shimiao
730e0994c8 oci/namespace: remove unnecessary variable idx 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2016-12-22 09:08:43 +08:00
liwenqi
128d07d349 modify some files 
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

update some files in the folder of distribution/xfer

Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

correct again

Signed-off-by: liwenqi <vikilwq@zju.edu.cn>
 2016-12-22 08:38:37 +08:00
Alex
ef15b217ea Label ARM issues through Poule #29644 
Signed-off-by: Alex <alexellis2@gmail.com>
 2016-12-21 23:46:48 +00:00
Brian Goff
76b4f5ac28 Merge pull request #29606 from albers/completion-plugins-bundled 
Improve bash completion for bundled plugins
 2016-12-21 17:12:27 -05:00
Vincent Demeester
dba271a42a
Move names to package api 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-21 22:42:47 +01:00
Vincent Demeester
7164b66cfc
Move ReplaceOrAppendEnvValues to container package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-21 22:42:39 +01:00
Vincent Demeester
930a9869f6
Refactor and extract TestRequire functionality 
This will help when extracting suites in their own package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-21 22:39:33 +01:00
Vincent Demeester
be88dd1032
Make privateRegistryURL (and dockerd) constant 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-21 22:34:55 +01:00
Brian Goff
0525a5d729 Merge pull request #27722 from micro-jumbo/master 
Stop returns 0 when docker service was not running
 2016-12-21 16:08:04 -05:00
Vincent Demeester
ba1c20f8d6 Merge pull request #29345 from yuexiao-wang/fix-err-info 
Fix incorrect words and formats in image
 2016-12-21 21:50:11 +01:00
Vincent Demeester
13f45768f0 Merge pull request #29468 from hongbin/volume-plugin-fuxi 
Add Fuxi Volume Plugin to the docs
 2016-12-21 21:49:28 +01:00
Brian Goff
e91604c0d2 Merge pull request #29212 from yongtang/29185-docker-inspect 
Fix `docker plugin inspect <unkown object>` issue on Windows
 2016-12-21 15:47:17 -05:00
Brian Goff
b567e8777d Merge pull request #28594 from Microsoft/jjh/fixtodo 
Windows: Fix a longstanding TODO
 2016-12-21 15:46:00 -05:00
Brian Goff
267d6935c5 Merge pull request #28714 from thaJeztah/move-logdriver-check-to-daemon 
move check for supported drivers to daemon
 2016-12-21 13:47:30 -05:00
Brian Goff
aa188634cc Merge pull request #28888 from endophage/notary0.5.0 
updating notary to released 0.5.0 version
 2016-12-21 13:44:18 -05:00
Brian Goff
7548fc7637 Merge pull request #28900 from tophj-ibm/ppc64le-rpmbuild-fedora23 
[ppc64le] add make rpm for fedora 24
 2016-12-21 13:43:13 -05:00
Brian Goff
d65d5db2a0 Merge pull request #29491 from yongtang/12162016-stats-error 
Improve error output for `docker stats ...`
 2016-12-21 13:19:20 -05:00
Brian Goff
b2e348f2a6 Merge pull request #29527 from allencloud/change-minor-mistake 
change minor mistake of spelling
 2016-12-21 13:15:00 -05:00
Brian Goff
de92e2fa74 Merge pull request #29577 from lixiaobing10051267/masterDevice 
several function names fixed in devmapper.go
 2016-12-21 12:21:22 -05:00
Brian Goff
584485abca Merge pull request #29637 from wxb0521/bo-docker-0.5 
some punctuation errors and a verb form error
 2016-12-21 12:18:04 -05:00
Brian Goff
fbc1f1a40c Merge pull request #29633 from qar/fix/docs 
Fix document typos
 2016-12-21 12:17:29 -05:00
Doug Davis
7a94c6974f Merge pull request #29623 from luojie233/branch3 
duplicated "the"
 2016-12-21 11:33:34 -05:00
allencloud
b44efead25 update service update in docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-12-22 00:11:08 +08:00
Sebastiaan van Stijn
2d1b578e67 Merge pull request #29611 from johnstep/ps-make-dco 
Fix regular expression for PowerShell DCO check
 2016-12-21 13:36:33 +01:00
Jie Luo
ea2dd4b5d0 duplicated the 
Signed-off-by: Jie Luo <luo612@zju.edu.cn>

typo

Signed-off-by: Jie Luo <luo612@zju.edu.cn>

fix some typos

Signed-off-by: Jie Luo <luo612@zju.edu.cn>
 2016-12-21 20:16:19 +08:00
Xinbo Weng
32996d6016 some punctuation errors and a verb form error 
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
 2016-12-21 20:05:19 +08:00
WANG Yuexiao
1ea0be9dbc Remove unused var 'errTLSConfigUnavailable' (#29626) 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-12-21 06:41:14 -05:00
Anran Qiao
3dc3921c76
Fix document typos 
Change the `State` field of the `/containers/json` remote API response to lowercase.
This change involves docs/api/v1.23.md and docs/api/v1.24.md

Signed-off-by: Anran Qiao <anran.qiao@daocloud.io>
 2016-12-21 18:28:52 +08:00
Yong Tang
0b3c10ac4d Fix docker plugin inspect <unkown object> issue on Windows 
This fix is a follow up for comment:
https://github.com/docker/docker/pull/29186/files#r91277345

While #29186 addresses the issue of `docker inspect <unknown object>`
on Windows, it actually makes `docker plugin inspect <unknown object>`
out `object not found` on Windows as well. This is actually misleading
as plugin is not supported on Windows.

This fix reverted the change in #29186 while at the same time,
checks `not supported` in `docker inspect <unknown object>` so that
- `docker plugin inspect <unknown object>` returns `not supported` on Windows
- `docker inspect <unknown object>` returns `not found` on Windows

This fix is related to #29186 and #29185.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-20 21:05:10 -08:00
lixiaobing10051267
f93b41e926 several function names fixed in devmapper.go 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-12-21 10:45:28 +08:00
Sebastiaan van Stijn
fb41283e49 Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win 
updates to glossary re: d4mac, d4win, toolbox per user request
 2016-12-21 02:16:28 +01:00