a0f0d908cc
Add bash completion for plugin API
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ecb707cb0f0ebb50fb1b90f4ab3c4ae611925ed2
Component: engine
2016-11-26 11:04:55 -08:00
40d5a75060
Merge pull request #28611 from vieux/fix_golint
...
fix a few golint errors
Upstream-commit: 96f50e9b7087bad25cb38e2985c26b509be0c403
Component: engine
2016-11-19 07:16:44 -05:00
a7e03990d9
Merge pull request #28438 from vdemeester/use-container-shell-instead-of-hardcoded
...
Use Container.Config.Shell instead of hardcoded…
Upstream-commit: f6f67891be80f40a8f8dd0e9296d56b6882ecc2f
Component: engine
2016-11-18 18:54:36 -08:00
68a4c9aae2
Merge pull request #28524 from aluzzardi/experimental-routes
...
router: Return explicit error rather than 404 for experimental.
Upstream-commit: c3fab6d47345f0d79efd88d0ea0495dd70f0e9f5
Component: engine
2016-11-18 18:49:15 -08:00
8b39397a80
Merge pull request #28561 from vieux/poc_cmd_error_unsuported
...
error on cli when trying to use experimental feature with non experimental daemon
Upstream-commit: 0337822d34d95962ec5bbbab59a0e25e932e668b
Component: engine
2016-11-18 18:47:36 -08:00
efab471941
Merge pull request #28605 from cpuguy83/use_v2_for_graph_plugins
...
Allow graphdriver plugins to use v2
Upstream-commit: eb8fc5dcc3eecc9f645fae8194732747501398da
Component: engine
2016-11-18 18:45:34 -08:00
59c81c21bb
Merge pull request #28613 from vieux/fix_govet
...
skip api/types/container/ (like golint) and fix one pkg
Upstream-commit: ee6f3b67961fd83bbec662ee7558e8cc47f778a9
Component: engine
2016-11-18 18:35:37 -08:00
c148947fe6
fix a few golint errors
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9c559e6d0b7190b4698de59e692a047beba017fd
Component: engine
2016-11-18 18:32:02 -08:00
6038277781
skip api/types/container/ (like golint) and fix one pkg
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 79a891efb7365e4f7d129a0142e66d2852781608
Component: engine
2016-11-18 16:33:50 -08:00
c257bd40a6
Merge pull request #28599 from aluzzardi/revendor-swarmkit
...
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Upstream-commit: a0866bd679f3099815d44664f7f53d099c66d426
Component: engine
2016-11-18 16:23:54 -08:00
9d6cdfc19f
fix gofmt in master
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 9f348d5625996faf7a0855b8eb52cdd4def3958e
Component: engine
2016-11-18 15:20:19 -08:00
861d75e8ee
Merge pull request #28603 from thaJeztah/flipping-hosts
...
swap position of "host" and "ip"
Upstream-commit: 8851e6ba70f8428f08a8c2cbcdad1b7532b55e43
Component: engine
2016-11-18 14:58:04 -08:00
33ea65e4f5
Allow graphdriver plugins to use v2
...
Currently the plugin initialization is too late for a loaded v2 plugin
to be usable as a graph driver.
This moves the initialization up before we create the graph driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 020b051dfb92edcb1e43cee77c881dd3e15481c0
Component: engine
2016-11-18 17:23:59 -05:00
b5a2933b08
Merge pull request #28590 from mlaventure/update-containerd
...
Update containerd & runc
Upstream-commit: e67664887da4b9657ead8f8e39a6a6c3fe122c99
Component: engine
2016-11-18 14:08:56 -08:00
b72665f309
Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
2016-11-18 13:32:26 -08:00
fd22b67295
swap position of "host" and "ip"
...
the service definition uses the format as defined
in http://man7.org/linux/man-pages/man5/hosts.5.html
(IP_address canonical_hostname [aliases...])
This format is the _reverse_ of the format used in
the container API.
Commit f32869d956eb175f88fd0b16992d2377d8eae79c
inadvertently used the incorrect order.
This fixes the order, and correctly sets it to;
IP-Address hostname
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f1b9df91722a229fd0cefd7a0868933b6b811544
Component: engine
2016-11-18 22:04:27 +01:00
71cdb489af
Merge pull request #28421 from aaronlehmann/digest-pinning-warnings
...
Return warnings from service create/update when digest pinning fails
Upstream-commit: 30d0c3899ef220e2a40f70e1e888a2d41fd7e7e8
Component: engine
2016-11-18 11:33:17 -08:00
5c4a8ff562
Merge pull request #28533 from allencloud/judge-manager-first-before-unlocking
...
judge manager before unlocking
Upstream-commit: eb0fc787e699b20d884c8d0dc23a5392e5aeb1a8
Component: engine
2016-11-18 11:27:48 -08:00
2efd6e2078
Return warnings from service create and service update when digest pinning fails
...
Modify the service update and create APIs to return optional warning
messages as part of the response. Populate these messages with an
informative reason when digest resolution fails.
This is a small API change, but significantly improves the UX. The user
can now get immediate feedback when they've specified a nonexistent
image or unreachable registry.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 948e60691e523022f88e7f8129f02106a0f8826c
Component: engine
2016-11-18 09:31:31 -08:00
b58d62c699
Merge pull request #28577 from chchliang/defercode
...
function setupOOMScoreAdj file close illogicality
Upstream-commit: 06e92cc2c1e840095f2f11f576fe6097b0fc44af
Component: engine
2016-11-18 11:48:58 -05:00
5cab628042
Update containerd & runc
...
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
2016-11-18 08:15:20 -08:00
7534114314
judge manager before unlocking
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 972a246c671b52786a5e57743babfcf7b5b5ae99
Component: engine
2016-11-18 23:49:40 +08:00
8b84a1af7f
Merge pull request #28586 from felipeweb/fix_infinite_recursion
...
fix infinite recursion
Upstream-commit: 8874f80e67c560f44322233bfc22ecd86b85e9e2
Component: engine
2016-11-18 06:44:52 -08:00
5dd4a95cae
Merge pull request #28578 from allencloud/remove-redudant-file-Close
...
remove redundant file Close
Upstream-commit: c41ff780d818e7e663a51c8b3a3a67d7390b417d
Component: engine
2016-11-18 08:21:58 -05:00
9ea16716af
Merge pull request #28580 from allencloud/fix-nits-in-error-message
...
fix typos
Upstream-commit: b4e69fb3aa6d0def712c5df8dfac8395f86be608
Component: engine
2016-11-18 13:18:23 +00:00
d9813c8cd8
Merge pull request #28584 from justincormack/devpts-multiple-4.8
...
Fix check config script on 4.8 kernels
Upstream-commit: 3e31f3744ea8f915ffb27398abac3efbdadfb8f2
Component: engine
2016-11-18 08:18:08 -05:00
bc1922b24e
fix infinite recursion
...
Signed-off-by: Felipe Oliveira <felipeweb.programador@gmail.com >
Upstream-commit: 271b1f27563b18a125b89d2d2629246213dbfd96
Component: engine
2016-11-18 10:57:50 -02:00
c61cce0a3d
Merge pull request #28354 from ripcurld00d/tag_creation
...
Change the docker-tag usage text to be clearer
Upstream-commit: 6c447f552c84cfd1c2840f1f1d3061485aa69d10
Component: engine
2016-11-18 13:02:40 +01:00
6a727694ed
Fix check config script on 4.8 kernels
...
DEVPTS_MULTIPLE_INSTANCES is no longer an option, it is always set, so
do not check for this post 4.8.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 228ee16df3d738efaf001309370b26561c49edd6
Component: engine
2016-11-18 11:42:05 +00:00
fac3c72b9c
Merge pull request #28540 from lixiaobing10051267/masterNewContainerId
...
expected new_container_id while testing ContainerCommit
Upstream-commit: c0acfd1dadff10b3151699558232af7b7fc67718
Component: engine
2016-11-18 12:13:30 +01:00
c2c8a860a9
Merge pull request #28565 from crosbymichael/cputime
...
Fix cfs period calculation
Upstream-commit: 9e43a68f697832cd895cf8c512d3f7d497b3d0f5
Component: engine
2016-11-18 12:12:53 +01:00
9532520f5c
remove redundant file Close
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 3dca62cfb1e7c6404cb4730425919f66c680b409
Component: engine
2016-11-18 17:50:02 +08:00
42dbfa07b6
function setupOOMScoreAdj file close illogicality
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: e82fa89bcd7118af9b1a7ef2f15748a9e879813d
Component: engine
2016-11-18 17:34:01 +08:00
8e7b567a6b
Fix cfs period calculation
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: aff99136b44c0a3d9ef381afd38a5cd05328ddc6
Component: engine
2016-11-18 00:47:43 -08:00
af870551d0
Change the docker-tag usage text to be clearer
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 039aca05c2eae8a06dc16ff97110539feb44d13b
Component: engine
2016-11-18 10:34:02 +02:00
5d1129c013
fix typo
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 1f039a66ac55c937f5dfa281a04009626d191f83
Component: engine
2016-11-18 15:51:36 +08:00
57cb96469f
Merge pull request #28558 from cpuguy83/add_vim
...
Add vim to Dockerfile
Upstream-commit: 27699ba8b23217525b0b026fa689834db4454a35
Component: engine
2016-11-17 21:14:19 -08:00
bab39b5981
expected new_container_id while testing ContainerCommit
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 773ae28daed55c8d89e753c1cb6b8b7e4102d3b6
Component: engine
2016-11-18 10:21:04 +08:00
a0ff297783
Add vim to Dockerfile
...
Why? Most of the time I end up needing an editor when in `make shell`.
Spent much time doing `apt-get update && apt-get install vim`.
Since we're already installing vim-common anyway...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7d1a72a2866aedbc7492a0cfc5cd4e13646322fe
Component: engine
2016-11-17 20:02:26 -05:00
2b9dc0f4a1
Merge pull request #28477 from vdemeester/update-reference-filter-cli-reference
...
Update `images` cli reference with reference filter
Upstream-commit: c6d69ea9e9a913e6036c5e3832083183ce92da23
Component: engine
2016-11-18 01:34:48 +01:00
f88393dfba
Merge pull request #28458 from yongtang/28456-cpus-error-message
...
Fix error messages for `--cpus` from daemon
Upstream-commit: 4b29f404b1afe0989426d7a0cc0d2e01a7a3f2b6
Component: engine
2016-11-17 16:29:21 -08:00
ecfb55a706
Merge pull request #28560 from akshaykarle/master
...
fix a typo
Upstream-commit: d9612db9745a6f1f0551536add119d4d2f9808c2
Component: engine
2016-11-18 01:03:05 +01:00
84fb1a0844
router: Return explicit error rather than 404 for experimental.
...
Instead of not adding experimental routes at all, fail with an explicit
message if the daemon is not running in experimental mode.
Added the `router.Experimental` which does this automatically.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 3976a33c1a578827da3726bec3927cc058fe326a
Component: engine
2016-11-17 15:51:47 -08:00
ba96408498
Merge pull request #28532 from stevvooe/disabled-swarm-service-unavailable
...
api/server/httputils: service unavailable for disable swarm
Upstream-commit: bbac9eeae68a2d1084961dc3b0adc4e9e729647c
Component: engine
2016-11-17 15:16:23 -08:00
02df9fec1f
Merge pull request #28347 from yongtang/28339-ignore-unkwnon-field-template
...
Use `map[string]bool` for `preProcessor` to ignore unknown fields
Upstream-commit: e61ad7465503a2cfe4c8cfec2f929831c28fd84a
Component: engine
2016-11-17 15:13:02 -08:00
47077e4caf
error on cli when trying to use experimental feature with non experimental daemon
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 98bb08fe38d6faabb639b31ea34aac2ea65f519d
Component: engine
2016-11-17 14:52:01 -08:00
3dbc7d0417
Merge pull request #28557 from vdemeester/fix-tini-compilation-error-on-photon
...
Update Tini to fix photon build-rpm compilation errors
Upstream-commit: 870f52533f6678594839a06d872a173f213b9a7c
Component: engine
2016-11-17 23:40:39 +01:00
88f526a8b0
Merge pull request #28552 from tomwilkie/fix-multi-read-seeker
...
Fix use of cap in MultiReadSeeker; possible data corruption bug.
Upstream-commit: 423c014038714cc28926429203580ca882bcd63f
Component: engine
2016-11-17 23:40:30 +01:00
9f30feb096
Merge pull request #28554 from vieux/showhelp
...
refactor help func in CLI
Upstream-commit: 43de09045c3aa7e1d2f45533cbd243a6e2d26f5e
Component: engine
2016-11-17 14:27:26 -08:00
0a4f3b6f0e
fix a typo
...
Signed-off-by: Akshay Karle <akshay.a.karle@gmail.com >
Upstream-commit: 2d08a764211035ec93aa3a97afb2baff074103da
Component: engine
2016-11-17 16:51:37 -05:00
