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

26718 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Crosby
684d3f0c9c Merge pull request #24740 from jizhilong/devmapper-deferred-remove 
devmapper: prevent libdevmapper from deleting /dev/mapper/docker-xxx symbolic links in RemoveDeviceDeferred
 2016-08-23 10:23:37 -07:00
Ji.Zhilong
5e505d101f devmapper: prevent libdevmapper from deleting device symlinks in RemoveDeviceDeferred 
if there is no cookie set in dm task, or flag DM_UDEV_DISABLE_LIBRARY_FALLBACK
is cleared for a DM_DEV_REMOVE task, libdevmapper will fallback to clean up the
symlink under /dev/mapper by itself, no matter the device removal is executed
immediately or deferred by the kernel.In some cases, the removal is deferred by the
kernel, while the symlink is deleted directly by libdevmapper, when docker tries to
activate the device again, the deferred removal will be canceld, but the symlink will
not show up again, so docker's attempt to mount the device by the symlink will fail,
and it will eventually leads to a `docker start/diff` error.

Fixes #24671

Signed-off-by: Ji.Zhilong <zhilongji@gmail.com>
 2016-08-23 23:58:53 +08:00
Vincent Demeester
b97f985054 Merge pull request #25939 from YuPengZTE/printf 
It is better to add "\n" in printf
 2016-08-23 10:26:54 +02:00
Vincent Demeester
442da0d8aa Merge pull request #25793 from yuexiao-wang/clean-makefile 
Clean up the Makefile
 2016-08-23 09:43:25 +02:00
Doug Davis
a949a79a58 Merge pull request #25931 from fj/patch-1 
Fix minor typo in "Getting Started" documentation
 2016-08-22 21:53:47 -05:00
Alexander Morozov
251bc2bcd7 Merge pull request #25833 from tonistiigi/update-swarmkit 
vendor: update swarmkit to 8a761950f
 2016-08-22 19:36:44 -07:00
YuPengZTE
9b015bd4fd It is better to add "\n" in printf 
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
 2016-08-23 09:01:25 +08:00
Aaron Lehmann
7cd88e5ec4 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager 
Remove option "--manager" description for swarm_join.md
 2016-08-22 13:13:21 -07:00
Alexander Morozov
2e1a594237 Merge pull request #25824 from dmcgowan/overlay2-make-faster 
Avoid fork on mount for overlay2 in common case
 2016-08-22 13:02:22 -07:00
John Feminella
435bc9d989 Fix minor typo in "Docker Engine runs navitvely" 
Signed-off-by: John Feminella <jxf@jxf.me>
 2016-08-22 15:43:26 -04:00
Derek McGowan
c13a985fa1 Avoid fork on mount for overlay2 in common case 
In the common case where the user is using /var/lib/docker and
an image with less than 60 layers, forking is not needed. Calculate
whether absolute paths can be used and avoid forking to mount in
those cases.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-08-22 11:43:10 -07:00
Tonis Tiigi
96a27cf093 Update executor changes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-22 11:36:20 -07:00
Tonis Tiigi
ee030251f2 vendor: update swarmkit in 8a761950f 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-22 11:36:06 -07:00
Aaron Lehmann
3b374a25f2 Merge pull request #25582 from anusha-ragunathan/detect-plugin-mediatype 
Make `docker pull` detect plugin content and error out.
 2016-08-22 09:29:51 -07:00
Brian Goff
2fb2bbe407 Merge pull request #25869 from cjdmax/master 
debian sysvinitscript one missed DOCKER->DOCKERD change
 2016-08-22 12:24:31 -04:00
Brian Goff
374caa98d8 Merge pull request #25872 from coolljt0725/fix_25870 
Persist pause state to disk to support container live restore
 2016-08-22 12:18:01 -04:00
Brian Goff
d3b0064d4a Merge pull request #25881 from justincormack/aarch64-manpages 
Add a Dockerfile for generating manpages on aarch64
 2016-08-22 12:16:09 -04:00
Brian Goff
43640a890f Merge pull request #25889 from vdemeester/refactoring-reachable-lisibility 
Make reachable/unreachable condition more readable
 2016-08-22 11:10:03 -04:00
lixiaobing10051267
344d7f773d Remove option "--manager" description for swarm_join.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-22 15:42:38 +08:00
Vincent Demeester
d2fa978d4d Merge pull request #25899 from yuexiao-wang/fix-overview 
Optimize description for Feature highlights
 2016-08-22 09:17:32 +02:00
Vincent Demeester
daf454d8cd Merge pull request #25719 from eskaaren/master 
You can force leave swarm
 2016-08-22 09:15:37 +02:00
Vincent Demeester
c1bdda0be8 Merge pull request #25775 from ddgenome/entrypoint-env 
Remove erroneous ENTRYPOINT note
 2016-08-22 09:13:54 +02:00
Sven Dowideit
e168f0b4ad Merge pull request #25835 from decoursin/patch-1 
Update apparmor error message
 2016-08-22 15:47:23 +10:00
Sven Dowideit
abd08f4784 Merge pull request #25901 from yuexiao-wang/add-content 
Add the content for how services work
 2016-08-22 11:58:30 +10:00
Justin Cormack
eb4ae8baed Merge pull request #23235 from runcom/go1.7 
Bump go to 1.7
 2016-08-21 19:49:52 +01:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-08-21 19:04:15 +02:00
Sebastiaan van Stijn
ab533a98dc Merge pull request #25902 from MihaiB/docs-link-fragment 
docs: fix typo in url fragment
 2016-08-21 02:12:02 +02:00
Anusha Ragunathan
9b6dcc8b9d Make docker pull detect plugin content and error out. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-08-20 12:54:35 -07:00
Mihai Borobocea
441ecc459f docs: fix typo in url fragment 
I noticed the broken hyperlink in this page:
https://docs.docker.com/engine/reference/builder/
The link should point to `#parser-directives`.

Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com>
 2016-08-20 16:19:05 +03:00
yuexiao-wang
2b0892c02e Add the content for how services work 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-20 17:32:29 +08:00
yuexiao-wang
dde0f86a88 Optimize description for Feature highlights 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-20 16:24:18 +08:00
Vincent Demeester
82a451bc94
Make reachable/unreachable condition more readable 
Introducing methods to make the intent of the condition clearer to the
eyes of the reader 👼.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-19 22:49:58 +02:00
Aaron Lehmann
ad37e30363 Merge pull request #25867 from lixiaobing10051267/masterScheduler 
It is orchestrator not scheduler to create swarm task
 2016-08-19 13:27:12 -07:00
Vincent Demeester
09b929083d Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion 
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
 2016-08-19 22:09:57 +02:00
Sebastiaan van Stijn
80798d28d3 Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken 
Modify usage of docker swarm join-token command
 2016-08-19 21:44:42 +02:00
Alexander Morozov
bf61c916ee Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs 
ppc64le: add support for building docker debs for xenial
 2016-08-19 08:35:31 -07:00
Justin Cormack
ecce6f339c Add a Dockerfile for generating manpages on aarch64 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-19 15:39:21 +01:00
Sebastiaan van Stijn
ec8f20cbf2 Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit 
Remove -run flag from commit command.
 2016-08-19 15:19:23 +02:00
Sebastiaan van Stijn
d6c75c3138 Merge pull request #25799 from vdemeester/25313-integration-no-cover 
Disable coverage on test-integration-cli
 2016-08-19 14:31:24 +02:00
Nick DeCoursin
ae4ad3d955 Update apparmor error message 
Signed-off-by: decoursin <n.decoursin@foodpanda.com>
 2016-08-19 14:22:27 +02:00
Justin Cormack
0bf6d4a2df Merge pull request #25858 from cpuguy83/fix_manfile 
Use the correct version of glide
 2016-08-19 12:44:51 +01:00
Vincent Demeester
54ed156879
Remove -run flag from commit command. 
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-19 13:14:03 +02:00
Lei Jitang
f4bbfc34ce Persist pause state to disk to support container live restore 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-08-19 05:32:33 -04:00
Liam Macgillavry
11eda60848 missed DOCKER->DOCKERD change in 1ac1b78b3a for 'status' 
Signed-off-by: Liam Macgillavry <liam@kumina.nl>
 2016-08-19 11:08:52 +02:00
lixiaobing10051267
cb9dfd391b It is orchestrator not scheduler to create swarm task 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-19 17:02:00 +08:00
Christopher Jones
64881dc331
ppc64le: add support for building docker debs for xenial 
This PR adds the ability to make docker debs for xenial on power

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-08-18 22:25:14 -04:00
lixiaobing10051267
9123ca546a Modify usage of docker swarm join-token command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-19 09:44:22 +08:00
Yong Tang
7fd2c80962 Update zsh and bash completion scripts. 
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-18 18:41:15 -07:00
yuexiao-wang
bf3d1d1e5a keep the same between rules and PHONY 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-19 09:08:39 +08:00
Yong Tang
6c5c34d50d Add --force in docker volume rm to fix out-of-band volume driver deletion 
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).

This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.

Related documentations have been updated.

This fix is tested manually with flocker, as is specified in #23367.
An integration test has also been added for the scenario described.

This fix fixes #23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-18 18:01:25 -07:00