Tonis Tiigi
0130526e07
vendor: update swarmkit to cb6d8131
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
2016-08-10 13:27:38 -07:00
Tibor Vass
fad1c60365
Merge pull request #25567 from justincormack/name_to_handle_at
...
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
Upstream-commit: 19a3289250e5b22081439659d34f8bd4266ed0a3
Component: engine
2016-08-10 12:02:23 -07:00
Tibor Vass
db498d9dca
Merge pull request #25550 from mrjana/net
...
Retry creating dynamic networks if not found
Upstream-commit: 92b10b497cf272f8fd307e2e6cc1f27199f132cd
Component: engine
2016-08-10 11:52:56 -07:00
Tibor Vass
874b6f9cd1
Merge pull request #25334 from crosbymichael/selinux-fedora
...
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
2016-08-10 11:40:33 -07:00
Alexander Morozov
cb1c855c27
Merge pull request #23951 from allencloud/defer-os-file-close
...
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
2016-08-10 11:07:15 -07:00
Tibor Vass
b3651d506c
Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie
...
Add support to install Docker on raspbian/jessie
Upstream-commit: a6aea68c35a6d0c27d2c299aaeff6aecd9a451e8
Component: engine
2016-08-10 11:06:04 -07:00
Sven Dowideit
ea87241cea
Merge pull request #25569 from friism/fix-typo-in-security-doc
...
update intro to say there are four things to consider
Upstream-commit: ce2ca236db87f8f580cb29be27b4f0b5341af0ca
Component: engine
2016-08-10 10:34:43 -07:00
Tibor Vass
8095bfc379
Merge pull request #25553 from vieux/restart_plugin
...
fix plugins restart on docker restart
Upstream-commit: 93b9b19204cc82a5b7205726f452020e209903d1
Component: engine
2016-08-10 10:34:17 -07:00
Michael Friis
abb7fbbaec
update intro to say there are four things to consider
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 9c37bf9f1fc28ef28dc62ea496e6f56dafcdfd89
Component: engine
2016-08-10 08:45:24 -07:00
Vincent Demeester
5cad711215
Merge pull request #25563 from lixiaobing10051267/master100
...
test container state timeout with 200 milliseconds
Upstream-commit: 414e3f3caba6068d9fcde068eb3240456bc0b3ad
Component: engine
2016-08-10 15:32:55 +02:00
Vincent Demeester
3fbb0152cb
Merge pull request #25406 from pwzgorilla/master
...
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
Upstream-commit: 3b1f82b52d53814e5ab60928de052ae2dba63f28
Component: engine
2016-08-10 14:07:30 +02:00
Vincent Demeester
77bffbde97
Merge pull request #25427 from yongtang/25404-service-update-env-add
...
Fix `service update --env-add` issue
Upstream-commit: 59ca493121680212ab119cbf264fcdb75b699adf
Component: engine
2016-08-10 14:07:05 +02:00
Justin Cormack
d430eb5c8c
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
...
Only open_by_handle_at requires CAP_DAC_READ_SEARCH.
This allows systemd to run with only `--cap-add SYS_ADMIN`
rather than having to also add `--cap-add DAC_READ_SEARCH`
as well which it does not really need.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: c1ca124682a90f3306b34ad104ba80e413f7bf88
Component: engine
2016-08-10 12:22:36 +01:00
lixiaobing10051267
7c36224e9c
test container state timeout with 200 milliseconds
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 51f927d4e5007d11d71a9cd68a6b1e93828becc5
Component: engine
2016-08-10 17:19:25 +08:00
mgniu
6e6c038441
use proto and addr replace protoAddrParts[0] and protoAddrParts[1]
...
Signed-off-by: mgniu <mgniu@dataman-inc.com >
Upstream-commit: dc4dcf89d885bc9bbd936337318236768dea478b
Component: engine
2016-08-10 16:03:00 +08:00
Sebastiaan van Stijn
058048cb32
Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
...
Add delete and update API documentation
Upstream-commit: 2f167a760904f5cf4f6250a55aa8f735fba74594
Component: engine
2016-08-10 08:01:13 +02:00
allencloud
1c502571ef
add defer file.Close to avoid potential fd leak
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
2016-08-10 08:36:09 +08:00
Jana Radhakrishnan
1ea11295f3
Retry creating dynamic networks if not found
...
In cases there are failures in task start, swarmkit might be trying to
restart the task again in the same node which might keep failing. This
creates a race where when a failed task is getting removed it might
remove the associated network while another task for the same service
or a different service but connected to the same network is proceeding
with starting the container knowing that the network is still
present. Fix this by reacting to `ErrNoSuchNetwork` error during
container start by trying to recreate the managed networks. If they
have been removed it will be recreated. If they are already present
nothing bad will happen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 117cef5e9766d6ba228770c225e816c6afd16ff8
Component: engine
2016-08-09 13:37:11 -07:00
Alexander Morozov
b9457de055
Merge pull request #25518 from yuexiao-wang/add-debug-info
...
add more info for debugging
Upstream-commit: eb28dde01f165849bf372e18200e83042c76f26c
Component: engine
2016-08-09 11:56:09 -07:00
Victor Vieux
2921fa6d1b
fix plugin restart on docker restart
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ab12ed4a5642edb4d96b54b6152f12260093f3ea
Component: engine
2016-08-09 11:49:28 -07:00
Sebastiaan van Stijn
b9dc82dd29
Merge pull request #25415 from avaid96/exitret
...
added functionality to interrupt the terminal when it is waiting for …
Upstream-commit: 91853e44aeb20e55bcfcad5041c274783fdc06bc
Component: engine
2016-08-09 16:47:54 +02:00
Sebastiaan van Stijn
bc307a89de
Merge pull request #25461 from coolljt0725/fix_update_mem
...
Fix update memory without memoryswap
Upstream-commit: 8233e2b54d8c88d9c5845cbd30d54e7d5d8cb852
Component: engine
2016-08-09 16:02:55 +02:00
Sebastiaan van Stijn
fe7b1d72f0
Merge pull request #23391 from Microsoft/WindowsSandboxSize
...
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
Sebastiaan van Stijn
1934f7b605
Merge pull request #25530 from thaJeztah/docs-update-image-load-response
...
docs: add missing "quiet" parameter for image/load and update response
Upstream-commit: 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4
Component: engine
2016-08-09 15:26:16 +02:00
Sebastiaan van Stijn
c2f89488d6
Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output
...
Update example output for node inspect
Upstream-commit: 80c49d1e5206eabf314069c262f7f643adf021e1
Component: engine
2016-08-09 15:24:43 +02:00
Vincent Demeester
7cd50dad87
Add delete and update API documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: da325c035df5f9d733c130bb57065cad2c9bf7fc
Component: engine
2016-08-09 14:50:46 +02:00
Sebastiaan van Stijn
46019ac375
Update example output for node inspect
...
commit 41d580c7a610d8111dc63353cbd94319ca854627 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.
This change updates the example output
of node inspect in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
2016-08-09 13:04:35 +02:00
Sebastiaan van Stijn
aae342284e
Merge pull request #25512 from diogomonica/add-created-at
...
Adding Joined at to node inspect --pretty
Upstream-commit: 41d580c7a610d8111dc63353cbd94319ca854627
Component: engine
2016-08-09 12:56:32 +02:00
Sebastiaan van Stijn
8f318a17a5
Merge pull request #25515 from WeiZhang555/fix-typo
...
Fix typo
Upstream-commit: c3fdb701287eca00074e41dbc1bb011513479395
Component: engine
2016-08-09 12:47:34 +02:00
Sebastiaan van Stijn
d4747af3dc
docs: add missing "quiet" parameter for image/load and update response
...
Progress reporting during image load was added
in 415dd8688618ac2b3872c6a5b5af3afcef2c3e10, but
the corresponding query-parameter was not documented
in the API docs.
This updates the API docs, and adds a response example
both with quiet enabled and disabled.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d13ed38471decb332e9a0872854a97730d548583
Component: engine
2016-08-09 12:08:33 +02:00
Sebastiaan van Stijn
62e3be9da8
Merge pull request #25527 from thaJeztah/fix-image-load-api-docs
...
docs: add missing content-type header for image load
Upstream-commit: 5fd483695f8d5ffa297f40730f21031f629333e7
Component: engine
2016-08-09 11:31:55 +02:00
yuexiao-wang
1a12027160
add more info for debugging
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 5882a9ea171b4cade430da8428beec180d0af952
Component: engine
2016-08-09 17:06:44 +08:00
Sebastiaan van Stijn
b5bd5a422a
docs: add missing content-type header for image load
...
Without a content-type header, Go uses a max post size
of 10 megabytes, which makes loading images fail
if they're larger than 10 megabytes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3892ac7e9418547785c36c91c3fb49a9c876c4b1
Component: engine
2016-08-09 10:56:49 +02:00
unclejack
835bbac65d
Merge pull request #25510 from justincormack/patricia-2.2.5
...
Update go-patricia to 2.2.5
Upstream-commit: 34877a41a8a6660a31ff3770566cc1341759b16c
Component: engine
2016-08-09 01:06:53 -07:00
Yong Tang
2c79262aba
Fix service update --env-add issue
...
This fix tries to address the issue in 25404 where updating environmental
variable in `service update --env-add` will not work.
The issue is because `--env-add` will only append the env, not update if
the same env already exist.
This fix tracks the env variable with a map and update if the variable
is the same.
An integration test has been added.
This fix fixes 25404.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: c6de8add5fd5443aa820adbcd3c9a438df78823f
Component: engine
2016-08-08 19:04:56 -07:00
Zhang Wei
31e42c852b
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: da6609ccdca80c587410b0b13606842412e329bd
Component: engine
2016-08-09 09:42:23 +08:00
Diogo Monica
8c7b924133
Adding Joined at to node inspect
...
Signed-off-by: Diogo Monica <diogo.monica@gmail.com >
Upstream-commit: d1244abc5ce6382b0ebe034bc604ad0c16d2b628
Component: engine
2016-08-08 16:23:10 -07:00
Justin Cormack
936c3ba707
Merge pull request #25502 from LK4D4/update_gorilla
...
vendor: use tags for gorilla projects
Upstream-commit: b2b41b2194a95c9f8b878b2a97706032fbf54c38
Component: engine
2016-08-08 23:28:15 +01:00
Sebastiaan van Stijn
938e44920b
Merge pull request #25506 from sfsmithcha/fix_network_name
...
fix overlay network example
Upstream-commit: c51f639531459e57f681f97c7358c04a96785db0
Component: engine
2016-08-09 00:24:08 +02:00
Justin Cormack
21ddd17186
Update go-patricia to 2.2.5
...
Fixes an issue that showed up on gccgo.
Fix #25360
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: e4402b285ba0a764ea1cffc1487c92b05b59a0ea
Component: engine
2016-08-08 22:28:41 +01:00
Charles Smith
0993849fc3
fix overlay network example
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0277eb9a32d96e11cbfe3c98229008ad29392a3f
Component: engine
2016-08-08 14:08:10 -07:00
Vincent Demeester
b2d7ec8107
Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
...
Move --rm to daemon side
Upstream-commit: 31e3970394998547d64e1220bd437a4c9c1061e3
Component: engine
2016-08-08 22:11:06 +02:00
Vincent Demeester
6ce2b2f7e0
Merge pull request #25494 from thaJeztah/fix-bind-mount-validation
...
fix validation of non-existing bind-mount source
Upstream-commit: b435d75526042ffe51df9d9415e98272ac26a975
Component: engine
2016-08-08 21:14:25 +02:00
Alexander Morozov
fc0f559a6c
vendor: use tags for gorilla projects
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 98530ac8e2b0e1003f4d8346c5b1445b281d4f9c
Component: engine
2016-08-08 11:58:32 -07:00
Vincent Demeester
0b3fc8bddf
Merge pull request #25496 from allencloud/update-go-units-vendor
...
update go-units vendor to newest version
Upstream-commit: 1c32bed48c160342871d4f1470dd4d62b4baa9a5
Component: engine
2016-08-08 20:34:00 +02:00
Vincent Demeester
f6949391e8
Merge pull request #25493 from justincormack/ADD-at-least-two
...
More helpful error message when not sufficiently argumentative
Upstream-commit: c52063d8bf0ff389b048471f7bcf9de7cbd39342
Component: engine
2016-08-08 20:28:08 +02:00
Zhang Wei
d56ceaaede
Add docs for auto-removal on daemon
...
Docs for #20848 : move "--rm" to daemon side.
Add description for introduced API changes.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7df815d2afe006ece9a3bc5c0642bd7643f40124
Component: engine
2016-08-09 00:47:12 +08:00
Justin Cormack
15fecb0bf3
More helpful error message when not sufficiently argumentative
...
The error message suggests you need one argument even when you
have provided one. Suggest having another argument.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 4ce93940b7c2a640c94296f20352cf6f052d1028
Component: engine
2016-08-08 17:22:09 +01:00
allencloud
b5cfc0f922
update go-units vendor to newest version
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
2016-08-09 00:10:19 +08:00
Sebastiaan van Stijn
0d2b77587c
fix validation of non-existing bind-mount source
...
Unlike `docker run -v..`, `docker service create --mount`
does not allow bind-mounting non-existing host paths.
This adds validation for the specified `source`, and
produces an error if the path is not found on the
host.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 84d5ab96ef33355e65f5c31210eb1777db372c52
Component: engine
2016-08-08 17:24:00 +02:00