623b2b65cf
Merge pull request #20263 from Microsoft/jjh/testunit-fileutils
...
Windows CI: Fixes panic in test-unit for FileUtils
Upstream-commit: 6c35350baba816f99bd8236b4b463bbb8d61e25d
Component: engine
2016-02-25 17:35:32 -08:00
8f26d8491f
Merge pull request #20481 from HackToday/addcheckfd
...
Add check for non-systemd fd use case
Upstream-commit: dd53ab14e4adb3d54fbd102dcce6bc476e5b3310
Component: engine
2016-02-25 16:38:53 -08:00
eadd157313
Merge pull request #20580 from BrianBland/crossRepoPushRetry
...
Improve auth fallback behavior for cross-repository push
Upstream-commit: d8b6e62f50c1ca40903b89a789b0a1806013a5b8
Component: engine
2016-02-25 16:37:04 -08:00
2bc21a41ec
Merge pull request #20673 from Microsoft/jjh/testkill
...
Windows CI: Port TestKill*
Upstream-commit: 5cb4693300114436ac62697b0dff35c0f5bce9aa
Component: engine
2016-02-26 01:11:51 +01:00
aa1fcfa3ec
Merge pull request #20697 from tiborvass/tls-remote-daemon-tests
...
Support TLS remote test daemon
Upstream-commit: 6fa5576e308d4c99e9a818f924483536a773afba
Component: engine
2016-02-25 16:16:40 -05:00
2e2994147a
Merge pull request #20663 from calavera/standalone_middlewares
...
Make server middleware standalone functions.
Upstream-commit: 2b819b76df64375c711279827e61c1f0a06d08c6
Component: engine
2016-02-25 15:01:07 -05:00
cfd2e7e48d
Support TLS remote test daemon
...
This will allow us to have a windows-to-linux CI, where the linux host
can be anywhere, connecting with TLS.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: f4a1e3db998816e5fcb0df56c29519c488890464
Component: engine
2016-02-25 14:12:17 -05:00
c41d1f589c
Merge pull request #20633 from crosbymichael/unit-file
...
Add "Delegate=yes" to docker's service file
Upstream-commit: 6582013207fd7eb7f31b26ecb2516eafb27479a1
Component: engine
2016-02-25 10:47:46 -08:00
48da675c58
Add "Delegate=yes" to docker's service file
...
We need to add delegate yes to docker's service file so that it can
manage the cgroups of the processes that it launches without systemd
interfering with them and moving the processes after it is reloaded.
```
Delegate=
Turns on delegation of further resource control partitioning to
processes of the unit. For unprivileged services (i.e. those
using the User= setting), this allows processes to create a
subhierarchy beneath its control group path. For privileged
services and scopes, this ensures the processes will have all
control group controllers enabled.
```
This is the proper fix for issue #20152
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d16737f971092767c1b9d28302a3f5aedbe2f576
Component: engine
2016-02-25 10:32:09 -08:00
3c9125646e
Merge pull request #20681 from icecrime/aaronl_maintainer
...
Add @aaronlehmann to maintainers
Upstream-commit: 60e2d5e0b03e5f15cf8f6249ba47e824678e54d8
Component: engine
2016-02-25 09:18:28 -08:00
d0fa8c5e37
Merge pull request #20572 from runcom/sudo-user
...
resolve the config file from the sudo user
Upstream-commit: 61d24e769d9f7a075f6881ba8b4523d5db9dcd6d
Component: engine
2016-02-25 16:05:25 +01:00
4c1fda1ae9
Merge pull request #20695 from vdemeester/fix-windowsTP4-check
...
Fix TestExecApiStartWithDetach on WindowsTP4
Upstream-commit: e4a6a889be70c1b5d92b5e4f9e7cbcf3f0941e4e
Component: engine
2016-02-25 16:04:23 +01:00
1f47465496
Fix TestExecApiStartWithDetach on WindowsTP4
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 21c85111231caeb6d2d342f13999d706cc33ff6a
Component: engine
2016-02-25 14:27:22 +01:00
ac3bbd04cb
Merge pull request #20691 from vincentbernat/doc/simplify-overlay
...
docs: simplify some steps of the overlay network guide
Upstream-commit: 41f2a674b8829365ba76a1e2aa403a7474fc9345
Component: engine
2016-02-25 13:31:13 +01:00
8bd4c1506d
docs: simplify some steps of the overlay network guide
...
Instead of using a process expansion to feed the right arguments to
docker to run on "mh-keystore", just moves up the next step which makes
"mh-keystore" the default target. This makes the guide a bit shorter and
easier to understand.
Signed-off-by: Vincent Bernat <vincent@bernat.im >
Upstream-commit: db5ded0dfc28c71276acf8500fabe3c64c15fbe1
Component: engine
2016-02-25 13:17:26 +01:00
5cbdc71804
Merge pull request #20679 from Microsoft/jjh/testrestart
...
Windows CI: Port docker_cli_restart_test.go
Upstream-commit: 7cf03700f891f0863f11ee57c2d3f8d68350d91b
Component: engine
2016-02-25 10:17:25 +01:00
5f817c4ab4
Merge pull request #20685 from estesp/userns-dev-fuse-fix
...
Filter auto-created device list if user namespaces enabled
Upstream-commit: 13b6733ee82f1e3f8749dccf345a0874382b0d8e
Component: engine
2016-02-25 10:01:13 +01:00
0d4eea62f0
Merge pull request #20687 from CWSpear/patch-1
...
Add the Local Persist plugin to docs
Upstream-commit: 4c014296a16d030674175f407df8a39e9aa3ae29
Component: engine
2016-02-25 09:39:07 +01:00
6395a43374
Merge pull request #20677 from Microsoft/jjh/testclilogs
...
Windows CI: Port docker_cli_logs_test.go
Upstream-commit: ca7ce05e819959def59f8e3c07fdf03cbdcc0770
Component: engine
2016-02-25 09:38:23 +01:00
81c0ade270
Merge pull request #20682 from cpuguy83/fix_volplugin_panics
...
Fix panic when plugin responds with null volume
Upstream-commit: 0ad04242b4a7f98b691573f9095330ba9e74ae3b
Component: engine
2016-02-25 09:32:54 +01:00
bd2ade864c
Merge pull request #20674 from Microsoft/jjh/testlogsapi
...
Windows CI: Port TestLogsAPI*
Upstream-commit: 9f1ad7850c03f75f9e69a8f3f76290533363ea7a
Component: engine
2016-02-25 09:11:15 +01:00
b0bf4b7771
Merge pull request #20680 from cpuguy83/close_plugin_req_body_on_error
...
Close resp body on plugin call error
Upstream-commit: a13945dd169b8ec83a3f17103a47ce124c024c03
Component: engine
2016-02-25 09:10:17 +01:00
ca8a5e468f
Merge pull request #20664 from Microsoft/jjh/busyboxtop
...
Windows CI: Integrity check for busybox top
Upstream-commit: abfc480f4be9a62c16e6af26160de8b80c805e51
Component: engine
2016-02-25 09:09:37 +01:00
0bf1e6c66b
Merge pull request #20683 from zhangjianfnst/fix-flaws-in-man
...
Fix some flaws in man.
Upstream-commit: 3f7c078aab164e708888f5292cb72754551ecd75
Component: engine
2016-02-25 09:01:32 +01:00
a9426d8ed7
Merge pull request #20671 from nakulpathak3/readme-extension
...
Add .md extension to readme for markdown rendering
Upstream-commit: 46c0c5e86b125556563709c5597ff97a966e7b4f
Component: engine
2016-02-25 08:40:00 +01:00
ae2cbbdd21
Add the Local Persist plugin
...
I wasn't 100% sure if it was appropriate to add plugin here, but @thaJeztah invited me to do so, so here it is!
(see https://github.com/CWSpear/local-persist/issues/17#issuecomment-188523784 )
Signed-off-by: Cameron Spear <cameronspear@gmail.com >
Upstream-commit: cc085be7cc19d2d1aed39c243b6990a7d04ee639
Component: engine
2016-02-24 23:29:58 -08:00
3a1a7f86d5
Filter auto-created device list if user namespaces enabled
...
Because devices will be bind-mounted instead of using `mknod`, we need
to make sure the source exists and filter the list by only those whose
source is a valid path/current device entry.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 9a554e8c37d522ed791b3bb55f9ba9f21e2ac76a
Component: engine
2016-02-25 00:11:36 -05:00
b417dc79d3
Windows CI: Port docker_cli_logs_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 10bd587d77eff327cfb0dff2add4688a183c41a3
Component: engine
2016-02-24 20:19:48 -08:00
4d716f809c
Merge pull request #20647 from coolljt0725/fix_20638
...
Fix exec start api with detach and AttachStdin at same time. fixes #2…
Upstream-commit: cee4ff1c4ac0bb47ed847f3bb725fd6233613937
Component: engine
2016-02-24 20:17:15 -08:00
acc7d09962
Improve fallback behavior for cross-repository push
...
Attempt layer mounts from up to 3 source repositories, possibly
falling back to a standard blob upload for cross repository pushes.
Addresses compatiblity issues with token servers which do not grant
multiple repository scopes, resulting in an authentication failure for
layer mounts, which would otherwise cause the push to terminate with an
error.
Signed-off-by: Brian Bland <brian.bland@docker.com >
Upstream-commit: 1d3480f9ba3525309030497d5c8a3dd5725ed15a
Component: engine
2016-02-24 19:13:35 -08:00
d1a3bc5db1
Fix exec start api with detach and AttachStdin at same time. fixes #20638
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: fb0ac1afd97e6e3bf3c13dcda5821f36b56cc62b
Component: engine
2016-02-24 21:04:44 -05:00
303d142eb8
Fix some flaws in man.
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: 877e6d76a4f16a1825a1e98cbfa9f5fef7a60c59
Component: engine
2016-02-25 09:48:21 +08:00
661cc031a6
Fix panic when plugin responds with null volume
...
In cases where the a plugin responds with both a null or empty volume
and a null or empty Err, the daemon would panic.
This is because we assumed the idiom if `err` is nil, then `v` must not
be but in reality the plugin may return whatever it wants and we want to
make sure it doesn't harm the daemon.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 96c79a1934dd52d2a6f648e519b5d4ac60ac8ca1
Component: engine
2016-02-24 20:45:38 -05:00
b93d5eafed
Add @aaronlehmann to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 5a264f280623bfe9744a08666eb06b080140c63b
Component: engine
2016-02-24 17:31:12 -08:00
1ca6d4e7c1
Close resp body on plugin call error
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 93ad9c31fce375b29606ea347df28c1205e7cb41
Component: engine
2016-02-24 20:09:51 -05:00
e682d2e8d7
Windows CI: Port docker_cli_restart_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 281c1ced6d6901ffb7faee209c243d0734abc792
Component: engine
2016-02-24 15:21:56 -08:00
1deeda21d4
Merge pull request #20630 from tkopczynski/10084-cmd-entrypoint
...
Docs: add note about CMD and ENTRYPOINT commands
Upstream-commit: 0f01b21702db8eb677e0a75d1a7b2fbb201b7b4c
Component: engine
2016-02-25 00:19:30 +01:00
9933657e25
Docs: add note about CMD and ENTRYPOINT commands
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 1ed84770c52b0abd026fe9c1acc51f19d94fad12
Component: engine
2016-02-24 22:57:25 +01:00
dc55874ee6
Windows CI: Port TestLogsAPI*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 00f65ae810679d587cb52466f52988ae9267e91d
Component: engine
2016-02-24 13:43:52 -08:00
d4cddca903
Windows CI: Port TestKill*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 03e2ff322b064504f5c22bd5fbe863ae1c4bf0fc
Component: engine
2016-02-24 13:33:25 -08:00
e0c56ee1f2
Add .md extension to readme for markdown rendering
...
Signed-off-by: Nakul Pathak <nakulpathak3@hotmail.com >
Upstream-commit: 0f35bb92fe8bbcf6d6136c5f780c16c2e0ea638f
Component: engine
2016-02-24 20:39:46 +00:00
045d5355a7
Make server middleware standalone functions.
...
Removing direct dependencies from the server configuration.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1ba44a832f6aae811dfc6235287dd5b99e8aa94c
Component: engine
2016-02-24 14:48:52 -05:00
4dd0ef305c
Windows CI: Integrity check for busybox top
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6a931c3590f5a2f274f9ab4c43452939d101a1b5
Component: engine
2016-02-24 11:00:47 -08:00
ab6aa3583c
Merge pull request #20641 from cpuguy83/revert_inotify_changes
...
Revert fsnotify changes
Upstream-commit: a7fefcf16cda4f91b9526b4db6d06ef12652f419
Component: engine
2016-02-24 10:10:03 -08:00
148812de36
Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers
...
Windows CI: Fix TestStartAttachMultipleContainers
Upstream-commit: 467c8b1a6a866081081a90ea9cec94640638781a
Component: engine
2016-02-24 08:46:00 -08:00
828abfa863
add file poller panic fix from 1.10.2
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f9524a4d24d6135ae1777738390e1f6a590a7a1c
Component: engine
2016-02-24 10:17:29 -05:00
8b47d652ee
Merge pull request #20649 from runcom/fedora-update-userns
...
docs: reference: commandline: daemon: fedora 23+ has mapping files
Upstream-commit: efb915800aa6595e24f39ed58d95d5ab5db02f7a
Component: engine
2016-02-24 16:04:02 +01:00
97222044b9
docs: reference: commandline: daemon: fedora 23+ has mapping files
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: eb902ef25773ca670eee126351547e77f384ad9d
Component: engine
2016-02-24 15:43:28 +01:00
008e491a8c
resolve the config file from the sudo user
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: afde6450ee7bd4a43765fdc0a9799b411276d9e4
Component: engine
2016-02-24 15:41:00 +01:00
8075c13623
Merge pull request #20619 from Microsoft/jjh/useraccounts
...
Windows: Updates for virtual user account
Upstream-commit: 5fdfb2985b209660a1a540222f614b73a0dc2e63
Component: engine
2016-02-24 13:48:27 +01:00
