1b913d2b2c
Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3
...
Vendor gcplogs deps
Upstream-commit: b0aab6e83e9d0235fef99b16a45fd2680995168f
Component: engine
2016-12-28 11:55:03 -05:00
da7df1bf03
Merge pull request #29684 from vdemeester/quick-unit
...
Enhance pkg/{httputils,integration}, distribution/xfer unit tests
Upstream-commit: 631f51015eb2590cab369085dbf262e825b0cf6e
Component: engine
2016-12-28 10:57:56 -05:00
859c16a319
Merge pull request #29737 from tonistiigi/fix-rootfs-check
...
Fix validation of plugins without rootfs in config
Upstream-commit: c246b02fcaf51cb53f498615203e9042749f3a2a
Component: engine
2016-12-28 10:49:58 -05:00
98526f223f
Merge pull request #29668 from dmcgowan/plugins-dct
...
Support Docker Content Trust for plugins
Upstream-commit: a412c1b7a03e24ba733809924c680f395fad2655
Component: engine
2016-12-28 10:43:32 -05:00
22afb90b38
Merge pull request #29752 from allencloud/fix-nits-in-comments
...
fix nits in comments
Upstream-commit: 9fab262690a1e9c465687b3dc22f84b053c5624f
Component: engine
2016-12-28 08:33:48 -05:00
4f858d145b
Enhance pkg/{httputils,integration}, distribution/xfer unit tests
...
- Make it possible to define a shorter waiting time of httputils
- Make a small hack to reduce the waiting time on distribution/xfer
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 522bfd926bcd8b031019e31cea41ce559cebc9b8
Component: engine
2016-12-28 11:54:05 +01:00
c23d186bee
Merge pull request #29744 from yuexiao-wang/update-docker-ps
...
Update the field 'CONTAINER ID' for docker ps
Upstream-commit: 01c62d6e54e49e2c954fb73881ede66ad6fa1b61
Component: engine
2016-12-28 11:46:06 +01:00
e1a6c1f1b2
Update the field 'CONTAINER ID' for docker ps
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b3faa7755a48eb09ba977502fd40e37ab98e1cf8
Component: engine
2016-12-29 02:00:31 +08:00
4d710d2209
fix some typos
...
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
try to pass test
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
try to pass the test
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn >
Upstream-commit: f1a19fa8c08a9b68d3a7014f9800cadf40fc150f
Component: engine
2016-12-28 09:43:27 +08:00
75dc0839ff
Fix validation of plugins without rootfs in config
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 6c7cb520094866cacbecb96695aed2d67d8a64a0
Component: engine
2016-12-27 15:36:12 -08:00
edfbbc6ec9
Replace vendor of aanand/compose-file with a local copy.
...
Add go-bindata for including the schema.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f5af9b9738892b5988f987ce5fbce6e31a10e768
Component: engine
2016-12-27 16:17:24 -05:00
5aa0397464
Add deps to test compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 32425d3add046ed2157c4bb36a3b5f2c2402c446
Component: engine
2016-12-27 16:17:24 -05:00
17e3d2d6b6
Support for docker content trust for plugins
...
Add integration test for docker content trust
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 14e8bba4f5d39e7a540bee44c133a1e73db48f84
Component: engine
2016-12-27 12:51:00 -08:00
96e9f269ff
Merge pull request #29666 from tonistiigi/client-deps
...
Clean up client binary dependencies
Upstream-commit: bf6eb855391e166a65db284567686fafbe4a9a0a
Component: engine
2016-12-27 15:01:24 -05:00
b279900e8a
Merge pull request #29701 from yuexiao-wang/add-field
...
Update 'ID' field for 'docker plugin ls'
Upstream-commit: 823718c3b4b65f966120543bac89ca240cb43f0a
Component: engine
2016-12-27 20:04:28 +01:00
e23a7bc09c
Merge pull request #29716 from yongtang/28885-docker-stack-ps-all
...
Remove `docker stack ps -a` to match removal of `docker service/node ps -a`
Upstream-commit: efbb23f3e6c585b64e7898a38b0088a0992ea883
Component: engine
2016-12-27 13:56:01 -05:00
6b571eeb83
Fix race/deadlock in v1 plugin handlers
...
When a plugin is activated, and then `plugins.Handle` is called to
register a new handler for a given plugin type, a deadlock occurs when
for anything which calls `waitActive`, including `Get`, and `GetAll`.
This happens because `Handle()` is setting `activated` to `false` to
ensure that plugin handlers are run on next activation.
Maybe these handlers should be called immediately for any plugins which
are already registered... but to preserve the existing behavior while
fixing the deadlock, track if handlers have been run on plugins and
reset when a new handler is registered.
The simplest way to reproduce the deadlock with Docker is to add a `-v
/foo` to the test container created for the external graphdriver tests.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2938dce794be7559ba73b4e9630015020a7fa937
Component: engine
2016-12-27 12:27:41 -05:00
205f5cbe76
Merge pull request #29694 from lixiaobing10051267/masterFileNodify2
...
It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
Upstream-commit: e3f61bd254071fc410fbd343bb103ab4ffef040c
Component: engine
2016-12-27 09:04:34 -08:00
0cddfcad2f
fix nits in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 6fb05778ba241b344dd9014ff1091e3f70a8b40c
Component: engine
2016-12-27 23:30:50 +08:00
e7707954e8
Merge pull request #29725 from yuexiao-wang/remove-redundant-var
...
Remove unused variable
Upstream-commit: 592f9891d4349b9f314320c9c5bde0b4d3959664
Component: engine
2016-12-27 16:05:43 +01:00
96e0490c24
Remove unused variable
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 08c6575cafd549a9d6688fab218377d73889ba72
Component: engine
2016-12-28 03:20:41 +08:00
55c61b86bd
Merge pull request #29720 from lixiaobing10051267/masterArmClone
...
use https clone url for docker/docker in ARM.md
Upstream-commit: 9f60ae538bd96f5387a7433ea2f562e1e299d299
Component: engine
2016-12-27 14:05:15 +00:00
7c2700ecf9
Remove redundant format
...
Signed-off-by: Ke Li <kel@splunk.com >
Add missing changes
Signed-off-by: Ke Li <kel@splunk.com >
User errors.New to create error
Signed-off-by: Ke Li <kel@splunk.com >
Upstream-commit: 514adcf4580effa4820be8d5e6d2c0ea9825ceb2
Component: engine
2016-12-27 21:46:52 +08:00
5f505e7636
Merge pull request #28692 from allencloud/splict-function-out-of-command-denifition-scope
...
refactor code to split function out of command definition scope
Upstream-commit: 7a339eb4e906e0dabccb94f1629e8899e283edfe
Component: engine
2016-12-27 13:48:12 +01:00
4579c9a13e
Merge pull request #29714 from vdemeester/small-requirement-fix
...
Display only the name of the requirement…
Upstream-commit: e7d4269a5048d4e472aabaeee309b2d786c24a11
Component: engine
2016-12-27 13:21:43 +01:00
2e85044fb0
Merge pull request #29712 from allencloud/add-network-name-when-disconnecting-error
...
display network name when disconnecting network error
Upstream-commit: 16500dfb1d1c0a3fc0d363ae782c22e8eda3b720
Component: engine
2016-12-27 13:08:07 +01:00
1ba9a6e736
Merge pull request #29709 from allencloud/fix-29708-more-correct-error-message
...
return more accurate error message when docker kill
Upstream-commit: 3702ee13bcb61ca72e63b2d177e756fd8ad1042f
Component: engine
2016-12-27 13:06:44 +01:00
6ae133987d
Merge pull request #29703 from allencloud/make-pkg-system-support-darwin
...
make more package in system support darwin
Upstream-commit: 398ac2a884a42d6ba0a40260f47b2f18dfa422ac
Component: engine
2016-12-27 13:01:13 +01:00
9c5810cac4
use https clone url for docker/docker in ARM.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cddd28817001bc07104bf7f3481b6e74fd43caa9
Component: engine
2016-12-27 19:51:45 +08:00
c7bd985ccb
Merge pull request #29707 from gesellix/delete-plugin-swagger
...
fix swagger description for `DELETE /plugin/{name}`
Upstream-commit: 55d5c80214481299a1627a3bb2e32c4c1e358700
Component: engine
2016-12-27 12:24:51 +01:00
44db4994e4
Merge pull request #29648 from yuexiao-wang/fix-man-docker
...
Update the manuals of docker and dockerd
Upstream-commit: e3000a4e2f24a061d54cf135196a72c8d767a9a0
Component: engine
2016-12-27 12:13:20 +01:00
5d4d6d04ad
Merge pull request #29699 from yuexiao-wang/update-index
...
Update the index of docker command line
Upstream-commit: af843c53f88c14fc494553a42ef45fb7937f13dc
Component: engine
2016-12-27 11:26:50 +01:00
a8c2e6aae2
Update the index of docker command line
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f649f54c60aee1a88c40b5c8c635c381f324b5a7
Component: engine
2016-12-28 02:39:04 +08:00
8a1df96ade
Update docker daemon to dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 62cc802f6160b7fbb506f5307d96a564cbfb5f1f
Component: engine
2016-12-27 17:32:15 +08:00
d3fb58de2f
Merge pull request #29705 from allencloud/rename-clusterProvider-to-cluster
...
rename clusterProvider to cluster in router
Upstream-commit: 1474bf6c6e830e3300ac37fb630d1a0d8841d4bf
Component: engine
2016-12-27 09:34:17 +01:00
b718dea1c9
return more accurate error message when docker kill
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: cf5734b2e16978b7ae224de566a7c21020c88a78
Component: engine
2016-12-27 13:38:13 +08:00
a7d9e53a66
display network name when disconnecting network error
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: f0844de8f00eef8fe42503986a87933516b11b46
Component: engine
2016-12-27 13:37:54 +08:00
4fcf2cd7b7
Fix image's CMD after WORKDIR in Dockerfile
...
This fix tries to fix 29667 where image's `CMD` is modified
after `WORKDIR` in Dockerfile.
The value of `b.runConfig.Cmd` was modified in the processing
of `WORKDIR`, in order to fix 28902. However, the same
`b.runConfig.Cmd` is passed to `commit()`.
This fix restored the `b.runConfig.Cmd` before `commit()`
the image for `WORKDIR`.
A test has been added.
This fix fixes 29667.
This fix is related to 28902, 28909, 28514.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 083602384737635af9a89b75a6ca6d27f7515dc6
Component: engine
2016-12-26 20:43:29 -08:00
98d422fce0
Move UAStringKey to dockerversion pkg
...
Removes grpc dependency from client
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 64981b9f095459ae65954ca80a86c8f4a735ef24
Component: engine
2016-12-26 18:53:22 -08:00
42b7611762
Move imageID validation to stringid pkg
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9f3046f9a03f1a710bdb7fcddd37ff50e71e31c3
Component: engine
2016-12-26 18:53:22 -08:00
8fc615e678
Move builder cli helper functions to own pkg
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: feaf5902f650f2326e1c41e82dfe28962f1ba46e
Component: engine
2016-12-26 18:53:22 -08:00
1c2e3ffc9c
Define PushResult in api types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 13222160e84a01db2174c0dbf3000761a756fd72
Component: engine
2016-12-26 18:53:22 -08:00
71e3564b45
Merge pull request #29690 from albers/completion-plugin-install--alias
...
Add bash completion for `plugin install --alias`
Upstream-commit: b81f47a288bcc28d1fe0f6fb4f79636074dbf67c
Component: engine
2016-12-26 18:42:54 -08:00
98d0c42181
Remove docker stack ps -a to match removal of docker service/node ps -a
...
In #28507 and #28885 , `docker service/node ps -a` has been removed so that
information about slots are show up even without `-a` flag.
The output of `docker stack ps` reused the same output as `docker service/node ps`.
However, the `-a` was still there. It might make sense to remove `docker stack ps -a`
as well to bring consistency with `docker service/node ps`.
This fix is related to #28507 , #28885 , and #25983 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9155e14e77a8235791a6de752f6f43e83308e23d
Component: engine
2016-12-26 13:47:43 -08:00
0ff4595d80
Display only the name of the requirement…
...
… relative to the integration-cli package
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 952c8aef3f221ee266627c26b9d8e4c0d936258f
Component: engine
2016-12-26 21:29:17 +01:00
c2f39444f3
Update 'ID' field for 'docker plugin ls'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1e6587ff280dc3dcac405a67af2ddfd83c78f983
Component: engine
2016-12-27 02:17:35 +08:00
24535638bb
fix swagger description for DELETE /plugin/{name}
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: e6b2829a7f59b59eb1c3653313bc3c6a56b47b0c
Component: engine
2016-12-26 15:27:59 +01:00
0f7668087b
make more package in system support darwin
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: c6dc4f85abd3b9722bf34265366e21cc7675623b
Component: engine
2016-12-26 21:30:06 +08:00
59db12afbb
rename clusterProvider to cluster in router
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0238e9e92bd8a2bdc805578b18bc342b1c482a85
Component: engine
2016-12-26 20:53:13 +08:00
58405ddf68
Merge pull request #29681 from tonistiigi/fix-invalid-inspect
...
Fix inspect object by invalid reference
Upstream-commit: 11eb9b0d268910bfa51d7669f652f7c49fe350cd
Component: engine
2016-12-26 13:09:32 +01:00
Brian Goff
Doug Davis
Vincent Demeester
Sebastiaan van Stijn
yuexiao-wang
zhenghenghuo
Tonis Tiigi
Daniel Nephin
Derek McGowan
Alexander Morozov
allencloud
Justin Cormack
Ke Li
lixiaobing10051267
Yong Tang
Tobias Gesellchen