248c173943
Merge pull request #24740 from jizhilong/devmapper-deferred-remove
...
devmapper: prevent libdevmapper from deleting /dev/mapper/docker-xxx symbolic links in RemoveDeviceDeferred
Upstream-commit: 684d3f0c9cccf540599bf8254da7ef65301a3170
Component: engine
2016-08-23 10:23:37 -07:00
57eb7bf948
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 >
Upstream-commit: 5e505d101f0201a4d045510d0a9b0c66697dedfe
Component: engine
2016-08-23 23:58:53 +08:00
0a33808f15
Merge pull request #25939 from YuPengZTE/printf
...
It is better to add "\n" in printf
Upstream-commit: b97f985054b2eea3e9ee10cc8f10c5e61ded4f9b
Component: engine
2016-08-23 10:26:54 +02:00
94a1c4d159
Merge pull request #25793 from yuexiao-wang/clean-makefile
...
Clean up the Makefile
Upstream-commit: 442da0d8aa0538ec495881016b6516f59b6f4d63
Component: engine
2016-08-23 09:43:25 +02:00
6d0358a080
Merge pull request #25931 from fj/patch-1
...
Fix minor typo in "Getting Started" documentation
Upstream-commit: a949a79a5899df2b57c0ff3e6a3e9aa432db248c
Component: engine
2016-08-22 21:53:47 -05:00
6aa95ab9d1
Merge pull request #25833 from tonistiigi/update-swarmkit
...
vendor: update swarmkit to 8a761950f
Upstream-commit: 251bc2bcd74b5899c77a620870d08e6820c4047e
Component: engine
2016-08-22 19:36:44 -07:00
4d10a59191
It is better to add "\n" in printf
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 9b015bd4fd7716243564250ada0e3797c0f29fcb
Component: engine
2016-08-23 09:01:25 +08:00
9ccbe410f0
Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
...
Remove option "--manager" description for swarm_join.md
Upstream-commit: 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259
Component: engine
2016-08-22 13:13:21 -07:00
c2e95ee295
Merge pull request #25824 from dmcgowan/overlay2-make-faster
...
Avoid fork on mount for overlay2 in common case
Upstream-commit: 2e1a5942374fac33b2b2546e2779f1475693844f
Component: engine
2016-08-22 13:02:22 -07:00
744ac1e4d5
Fix minor typo in "Docker Engine runs navitvely"
...
Signed-off-by: John Feminella <jxf@jxf.me >
Upstream-commit: 435bc9d9898febc8b9c16a02e4114745a52374fc
Component: engine
2016-08-22 15:43:26 -04:00
670946bf76
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)
Upstream-commit: c13a985fa1196a5ed782d5ac68a4bbb68dd529ca
Component: engine
2016-08-22 11:43:10 -07:00
32e409f5b7
Update executor changes from swarmkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 96a27cf0931974b602acfdd74dfcc5142500c7ba
Component: engine
2016-08-22 11:36:20 -07:00
d90e537965
vendor: update swarmkit in 8a761950f
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ee030251f28a50d96634d58bc6396382c29a4281
Component: engine
2016-08-22 11:36:06 -07:00
4a7de16b5f
Merge pull request #25582 from anusha-ragunathan/detect-plugin-mediatype
...
Make `docker pull` detect plugin content and error out.
Upstream-commit: 3b374a25f2ded96ce46dccaabd1ce3aa50e401c0
Component: engine
2016-08-22 09:29:51 -07:00
c0e81b448f
Merge pull request #25869 from cjdmax/master
...
debian sysvinitscript one missed DOCKER->DOCKERD change
Upstream-commit: 2fb2bbe4079e3b278e0a15510475c4c1b5f9ecd6
Component: engine
2016-08-22 12:24:31 -04:00
daeb1250d3
Merge pull request #25872 from coolljt0725/fix_25870
...
Persist pause state to disk to support container live restore
Upstream-commit: 374caa98d8a1aac01478c1d9b69f9cf13874f1b3
Component: engine
2016-08-22 12:18:01 -04:00
be4d8fd4f5
Merge pull request #25881 from justincormack/aarch64-manpages
...
Add a Dockerfile for generating manpages on aarch64
Upstream-commit: d3b0064d4af29776f12f73ad89d623b0e21a5979
Component: engine
2016-08-22 12:16:09 -04:00
17b771a0a4
Merge pull request #25889 from vdemeester/refactoring-reachable-lisibility
...
Make reachable/unreachable condition more readable
Upstream-commit: 43640a890f7f271b5dbcdd076948171336635b21
Component: engine
2016-08-22 11:10:03 -04:00
f7b9cff570
Remove option "--manager" description for swarm_join.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 344d7f773d10d429b39c8e4e5c7426d4d1998300
Component: engine
2016-08-22 15:42:38 +08:00
968533071a
Merge pull request #25899 from yuexiao-wang/fix-overview
...
Optimize description for Feature highlights
Upstream-commit: d2fa978d4d66622a197eb98f9a77fa217e25f449
Component: engine
2016-08-22 09:17:32 +02:00
36f79775aa
Merge pull request #25719 from eskaaren/master
...
You can force leave swarm
Upstream-commit: daf454d8cd6146ef2cb644614301806ef59c58cc
Component: engine
2016-08-22 09:15:37 +02:00
536db7fdc5
Merge pull request #25775 from ddgenome/entrypoint-env
...
Remove erroneous ENTRYPOINT note
Upstream-commit: c1bdda0be8616f987245cb61a4aedc09c8b5c806
Component: engine
2016-08-22 09:13:54 +02:00
c7c596011e
Merge pull request #25835 from decoursin/patch-1
...
Update apparmor error message
Upstream-commit: e168f0b4ad4dfc11a4423a6785d80153f0969808
Component: engine
2016-08-22 15:47:23 +10:00
bdc88f8035
Merge pull request #25901 from yuexiao-wang/add-content
...
Add the content for how services work
Upstream-commit: abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5
Component: engine
2016-08-22 11:58:30 +10:00
5bd656226f
Merge pull request #23235 from runcom/go1.7
...
Bump go to 1.7
Upstream-commit: eb4ae8baede682c3ce9985a6a99ede48128b9565
Component: engine
2016-08-21 19:49:52 +01:00
0f0bfaaffb
Bump go to 1.7
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Component: engine
2016-08-21 19:04:15 +02:00
3b9e9d8c6a
Merge pull request #25902 from MihaiB/docs-link-fragment
...
docs: fix typo in url fragment
Upstream-commit: ab533a98dceecec707414006544411cfd18b2d30
Component: engine
2016-08-21 02:12:02 +02:00
83016f7351
Make docker pull detect plugin content and error out.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9b6dcc8b9d1366d3da3c8f60f89de1a36b087b88
Component: engine
2016-08-20 12:54:35 -07:00
84a03f36d0
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 >
Upstream-commit: 441ecc459f0d08a930ee2d6f4502f24e2217e1fc
Component: engine
2016-08-20 16:19:05 +03:00
08af9769e8
Add the content for how services work
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 2b0892c02eb50c20e8752643faf558dd150dbc77
Component: engine
2016-08-20 17:32:29 +08:00
e22764bf9f
Optimize description for Feature highlights
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: dde0f86a88989c02256a8b301ff8388752d88eed
Component: engine
2016-08-20 16:24:18 +08:00
3ab26843b3
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 >
Upstream-commit: 82a451bc94729b0dc2cc0ca94be60de70154f1c2
Component: engine
2016-08-19 22:49:58 +02:00
cfba442486
Merge pull request #25867 from lixiaobing10051267/masterScheduler
...
It is orchestrator not scheduler to create swarm task
Upstream-commit: ad37e303638dd37b3bf2eef8916e8e0376e2acce
Component: engine
2016-08-19 13:27:12 -07:00
e3afe81751
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
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
2016-08-19 22:09:57 +02:00
034eb19e73
Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken
...
Modify usage of docker swarm join-token command
Upstream-commit: 80798d28d36936f16fae4dd60af27cd08f54817c
Component: engine
2016-08-19 21:44:42 +02:00
7db773fe39
Merge pull request #23438 from tophj-ibm/ppc64le-build-xenial-debs
...
ppc64le: add support for building docker debs for xenial
Upstream-commit: bf61c916ee12f2f1eda83bde7021e9bc4ee1ae15
Component: engine
2016-08-19 08:35:31 -07:00
60a509088f
Add a Dockerfile for generating manpages on aarch64
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: ecce6f339c7eff048013eadbff1910237446a421
Component: engine
2016-08-19 15:39:21 +01:00
5f54e81cc1
Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit
...
Remove -run flag from commit command.
Upstream-commit: ec8f20cbf2edba00e645175675e8dca7c03b1350
Component: engine
2016-08-19 15:19:23 +02:00
cdca524947
Merge pull request #25799 from vdemeester/25313-integration-no-cover
...
Disable coverage on test-integration-cli
Upstream-commit: d6c75c31387cd144d4bd08c9bc3191ade16ad8ea
Component: engine
2016-08-19 14:31:24 +02:00
4dc1ced56e
Update apparmor error message
...
Signed-off-by: decoursin <n.decoursin@foodpanda.com >
Upstream-commit: ae4ad3d955ffd5c31b3103914318dbfa49c17e9c
Component: engine
2016-08-19 14:22:27 +02:00
cb7a5013da
Merge pull request #25858 from cpuguy83/fix_manfile
...
Use the correct version of glide
Upstream-commit: 0bf6d4a2dfea1251e6f5102fd9e235b8c77aa9f9
Component: engine
2016-08-19 12:44:51 +01:00
ac9a57031e
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 >
Upstream-commit: 54ed156879352afb06ecb94fa7b6518a39eb5fd2
Component: engine
2016-08-19 13:14:03 +02:00
165357a3a8
Persist pause state to disk to support container live restore
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: f4bbfc34ce1785863dcdea44c981f6532c5e2860
Component: engine
2016-08-19 05:32:33 -04:00
d3f9e431a9
missed DOCKER->DOCKERD change in 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1 for 'status'
...
Signed-off-by: Liam Macgillavry <liam@kumina.nl >
Upstream-commit: 11eda60848e476c3a1d84a035642edba74e94c8a
Component: engine
2016-08-19 11:08:52 +02:00
48a77b1711
It is orchestrator not scheduler to create swarm task
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cb9dfd391ba4df5c34f83f5070e0b685c99bf591
Component: engine
2016-08-19 17:02:00 +08:00
c49a123086
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 >
Upstream-commit: 64881dc331f1f0ff861eb82bb05eef63d6693a67
Component: engine
2016-08-18 22:25:14 -04:00
715ba2d5b3
Modify usage of docker swarm join-token command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9123ca546a49f6738a918b89ba7a41963083be54
Component: engine
2016-08-19 09:44:22 +08:00
d30cc14f93
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 >
Upstream-commit: 7fd2c809622e66bb3157fbf1ab797152636a2df5
Component: engine
2016-08-18 18:41:15 -07:00
46c68f2339
keep the same between rules and PHONY
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf3d1d1e5a39cb66ff58cedbcc9d6e84163a35f8
Component: engine
2016-08-19 09:08:39 +08:00
a603b90d7f
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 >
Upstream-commit: 6c5c34d50d377d1c5318a255240fb2dc9c23cf92
Component: engine
2016-08-18 18:01:25 -07:00
