Commit graph

26649 commits

Author SHA1 Message Date
Alexander Morozov
64605d709f Merge pull request #23951 from allencloud/defer-os-file-close
add defer file.Close to avoid potential fd leak
2016-08-10 11:07:15 -07:00
Tibor Vass
a6aea68c35 Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie
Add support to install Docker on raspbian/jessie
2016-08-10 11:06:04 -07:00
Sven Dowideit
ce2ca236db Merge pull request #25569 from friism/fix-typo-in-security-doc
update intro to say there are four things to consider
2016-08-10 10:34:43 -07:00
Tibor Vass
93b9b19204 Merge pull request #25553 from vieux/restart_plugin
fix plugins restart on docker restart
2016-08-10 10:34:17 -07:00
Sebastiaan van Stijn
29fb644c18
Improve layout for runmetrics
Change bullet-lists to tables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-10 18:42:43 +02:00
Michael Friis
9c37bf9f1f update intro to say there are four things to consider
Signed-off-by: Michael Friis <friism@gmail.com>
2016-08-10 08:45:24 -07:00
allencloud
bd11a269bc make more pkgs support darwin
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-10 22:56:05 +08:00
Brian Goff
82dd2c3159 Make test suites dump daemon stack on test timeout
Use `OnTimeout` callback on test timeouts to trigger a stack dump for
running daemons. This will help analyze stuck tests.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-10 10:26:30 -04:00
Vincent Demeester
414e3f3cab Merge pull request #25563 from lixiaobing10051267/master100
test container state timeout with 200 milliseconds
2016-08-10 15:32:55 +02:00
Vincent Demeester
3b1f82b52d Merge pull request #25406 from pwzgorilla/master
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
2016-08-10 14:07:30 +02:00
Vincent Demeester
59ca493121 Merge pull request #25427 from yongtang/25404-service-update-env-add
Fix `service update --env-add` issue
2016-08-10 14:07:05 +02:00
Justin Cormack
c1ca124682 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>
2016-08-10 12:22:36 +01:00
lixiaobing10051267
51f927d4e5 test container state timeout with 200 milliseconds
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-10 17:19:25 +08:00
mgniu
dc4dcf89d8 use proto and addr replace protoAddrParts[0] and protoAddrParts[1]
Signed-off-by: mgniu <mgniu@dataman-inc.com>
2016-08-10 16:03:00 +08:00
Sebastiaan van Stijn
2f167a7609 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
Add delete and update API documentation
2016-08-10 08:01:13 +02:00
Zhang Wei
a422813113 Bugfix: client hangs after run container
New codes introduced a new method to wait container's exit code and
removal via Events API, but it specified a "since" filter based on
client side clock, which sometimes isn't synced up with daemon's clock,
hence leads the client to hang on waiting container's exit status.

This commit brings the Events call before start, and removes the time
filter, so that it can catch daemon events correctly without care of the
clock issue.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-10 09:36:06 +08:00
Yong Tang
2f27632cde Return application/json for image/load API (quite=1)
This fix tries to address the issue raised in 25529 wehre the
image/load API returns `application/json` for quiet=0 and
`text/plain` for quite=1.

This fix makes the change so that `application/json` is returned
for both quiet=0 and quite=1.

This fix has been tested manually.

This fix fixes 25529.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-09 17:55:42 -07:00
allencloud
0ead624473 add defer file.Close to avoid potential fd leak
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-10 08:36:09 +08:00
Jana Radhakrishnan
117cef5e97 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>
2016-08-09 13:37:11 -07:00
Alexander Morozov
eb28dde01f Merge pull request #25518 from yuexiao-wang/add-debug-info
add more info for debugging
2016-08-09 11:56:09 -07:00
Victor Vieux
ab12ed4a56 fix plugin restart on docker restart
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-09 11:49:28 -07:00
Sebastiaan van Stijn
91853e44ae Merge pull request #25415 from avaid96/exitret
added functionality to interrupt the terminal when it is waiting for …
2016-08-09 16:47:54 +02:00
Sebastiaan van Stijn
8233e2b54d Merge pull request #25461 from coolljt0725/fix_update_mem
Fix update memory without memoryswap
2016-08-09 16:02:55 +02:00
Sebastiaan van Stijn
04e021d751 Merge pull request #23391 from Microsoft/WindowsSandboxSize
Windows: Added support for storage-opt size
2016-08-09 15:34:39 +02:00
Brian Goff
51771a3094 re-vendor go-check
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-08-09 09:27:58 -04:00
Sebastiaan van Stijn
06e3ea1417 Merge pull request #25530 from thaJeztah/docs-update-image-load-response
docs: add missing "quiet" parameter for image/load and update response
2016-08-09 15:26:16 +02:00
Sebastiaan van Stijn
80c49d1e52 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output
Update example output for node inspect
2016-08-09 15:24:43 +02:00
Vincent Demeester
da325c035d
Add delete and update API documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-09 14:50:46 +02:00
Sebastiaan van Stijn
dcb052c12b
Update example output for node inspect
commit 41d580c7a6 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>
2016-08-09 13:04:35 +02:00
Sebastiaan van Stijn
41d580c7a6 Merge pull request #25512 from diogomonica/add-created-at
Adding Joined at to node inspect --pretty
2016-08-09 12:56:32 +02:00
Sebastiaan van Stijn
c3fdb70128 Merge pull request #25515 from WeiZhang555/fix-typo
Fix typo
2016-08-09 12:47:34 +02:00
Sebastiaan van Stijn
d13ed38471
docs: add missing "quiet" parameter for image/load and update response
Progress reporting during image load was added
in 415dd86886, 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>
2016-08-09 12:08:33 +02:00
Sebastiaan van Stijn
5fd483695f Merge pull request #25527 from thaJeztah/fix-image-load-api-docs
docs: add missing content-type header for image load
2016-08-09 11:31:55 +02:00
yuexiao-wang
5882a9ea17 add more info for debugging
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-09 17:06:44 +08:00
Sebastiaan van Stijn
3892ac7e94
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>
2016-08-09 10:56:49 +02:00
unclejack
34877a41a8 Merge pull request #25510 from justincormack/patricia-2.2.5
Update go-patricia to 2.2.5
2016-08-09 01:06:53 -07:00
Yong Tang
c6de8add5f 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>
2016-08-08 19:04:56 -07:00
Zhang Wei
da6609ccdc Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-08-09 09:42:23 +08:00
Diogo Monica
d1244abc5c Adding Joined at to node inspect
Signed-off-by: Diogo Monica <diogo.monica@gmail.com>
2016-08-08 16:23:10 -07:00
Justin Cormack
b2b41b2194 Merge pull request #25502 from LK4D4/update_gorilla
vendor: use tags for gorilla projects
2016-08-08 23:28:15 +01:00
Sebastiaan van Stijn
c51f639531 Merge pull request #25506 from sfsmithcha/fix_network_name
fix overlay network example
2016-08-09 00:24:08 +02:00
John Howard
1cb9e9b44e Windows: Block ReFS file systems
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-08-08 14:30:37 -07:00
Justin Cormack
e4402b285b 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>
2016-08-08 22:28:41 +01:00
Charles Smith
0277eb9a32 fix overlay network example
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-08 14:08:10 -07:00
Darren Stahl
5eaf86c6db Changed SignalProcess to use new hcsshim API
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-08-08 14:03:12 -07:00
Vincent Demeester
31e3970394 Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
Move --rm to daemon side
2016-08-08 22:11:06 +02:00
Vincent Demeester
b435d75526 Merge pull request #25494 from thaJeztah/fix-bind-mount-validation
fix validation of non-existing bind-mount source
2016-08-08 21:14:25 +02:00
Alexander Morozov
98530ac8e2 vendor: use tags for gorilla projects
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-08-08 11:58:32 -07:00
Vincent Demeester
1c32bed48c Merge pull request #25496 from allencloud/update-go-units-vendor
update go-units vendor to newest version
2016-08-08 20:34:00 +02:00
Vincent Demeester
c52063d8bf Merge pull request #25493 from justincormack/ADD-at-least-two
More helpful error message when not sufficiently argumentative
2016-08-08 20:28:08 +02:00