faf4604dac
integration-cli: remove not necessary -d
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-27 18:27:25 +01:00
9792308b84
Merge pull request #20515 from raesene/patch-1
...
Update security.md with basic User Namespace info.
2016-02-26 14:02:46 +01:00
d622494c3b
Merge pull request #20722 from thaJeztah/remove-vivid-reference
...
remove leftover Ubuntu 15.04 from install docs
2016-02-26 13:59:36 +01:00
1ca064cb62
remove leftover Ubuntu 15.04 from install docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-26 13:00:27 +01:00
6748cc10ac
Merge pull request #20655 from hqhq/hq_fix_update_memoryswap
...
Fix problems when update swap memory
2016-02-25 22:28:53 -05:00
6c35350bab
Merge pull request #20263 from Microsoft/jjh/testunit-fileutils
...
Windows CI: Fixes panic in test-unit for FileUtils
2016-02-25 17:35:32 -08:00
dd53ab14e4
Merge pull request #20481 from HackToday/addcheckfd
...
Add check for non-systemd fd use case
2016-02-25 16:38:53 -08:00
d8b6e62f50
Merge pull request #20580 from BrianBland/crossRepoPushRetry
...
Improve auth fallback behavior for cross-repository push
2016-02-25 16:37:04 -08:00
5cb4693300
Merge pull request #20673 from Microsoft/jjh/testkill
...
Windows CI: Port TestKill*
2016-02-26 01:11:51 +01:00
6fa5576e30
Merge pull request #20697 from tiborvass/tls-remote-daemon-tests
...
Support TLS remote test daemon
2016-02-25 16:16:40 -05:00
2b819b76df
Merge pull request #20663 from calavera/standalone_middlewares
...
Make server middleware standalone functions.
2016-02-25 15:01:07 -05:00
f4a1e3db99
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>
2016-02-25 14:12:17 -05:00
6582013207
Merge pull request #20633 from crosbymichael/unit-file
...
Add "Delegate=yes" to docker's service file
2016-02-25 10:47:46 -08:00
d16737f971
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>
2016-02-25 10:32:09 -08:00
60e2d5e0b0
Merge pull request #20681 from icecrime/aaronl_maintainer
...
Add @aaronlehmann to maintainers
2016-02-25 09:18:28 -08:00
61d24e769d
Merge pull request #20572 from runcom/sudo-user
...
resolve the config file from the sudo user
2016-02-25 16:05:25 +01:00
e4a6a889be
Merge pull request #20695 from vdemeester/fix-windowsTP4-check
...
Fix TestExecApiStartWithDetach on WindowsTP4
2016-02-25 16:04:23 +01:00
21c8511123
Fix TestExecApiStartWithDetach on WindowsTP4
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-02-25 14:27:22 +01:00
41f2a674b8
Merge pull request #20691 from vincentbernat/doc/simplify-overlay
...
docs: simplify some steps of the overlay network guide
2016-02-25 13:31:13 +01:00
db5ded0dfc
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>
2016-02-25 13:17:26 +01:00
7cf03700f8
Merge pull request #20679 from Microsoft/jjh/testrestart
...
Windows CI: Port docker_cli_restart_test.go
2016-02-25 10:17:25 +01:00
13b6733ee8
Merge pull request #20685 from estesp/userns-dev-fuse-fix
...
Filter auto-created device list if user namespaces enabled
2016-02-25 10:01:13 +01:00
4c014296a1
Merge pull request #20687 from CWSpear/patch-1
...
Add the Local Persist plugin to docs
2016-02-25 09:39:07 +01:00
ca7ce05e81
Merge pull request #20677 from Microsoft/jjh/testclilogs
...
Windows CI: Port docker_cli_logs_test.go
2016-02-25 09:38:23 +01:00
0ad04242b4
Merge pull request #20682 from cpuguy83/fix_volplugin_panics
...
Fix panic when plugin responds with null volume
2016-02-25 09:32:54 +01:00
9f1ad7850c
Merge pull request #20674 from Microsoft/jjh/testlogsapi
...
Windows CI: Port TestLogsAPI*
2016-02-25 09:11:15 +01:00
a13945dd16
Merge pull request #20680 from cpuguy83/close_plugin_req_body_on_error
...
Close resp body on plugin call error
2016-02-25 09:10:17 +01:00
abfc480f4b
Merge pull request #20664 from Microsoft/jjh/busyboxtop
...
Windows CI: Integrity check for busybox top
2016-02-25 09:09:37 +01:00
3f7c078aab
Merge pull request #20683 from zhangjianfnst/fix-flaws-in-man
...
Fix some flaws in man.
2016-02-25 09:01:32 +01:00
46c0c5e86b
Merge pull request #20671 from nakulpathak3/readme-extension
...
Add .md extension to readme for markdown rendering
2016-02-25 08:40:00 +01:00
cc085be7cc
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>
2016-02-24 23:29:58 -08:00
9a554e8c37
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)
2016-02-25 00:11:36 -05:00
10bd587d77
Windows CI: Port docker_cli_logs_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 20:19:48 -08:00
cee4ff1c4a
Merge pull request #20647 from coolljt0725/fix_20638
...
Fix exec start api with detach and AttachStdin at same time. fixes #2…
2016-02-24 20:17:15 -08:00
1d3480f9ba
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>
2016-02-24 19:13:35 -08:00
fb0ac1afd9
Fix exec start api with detach and AttachStdin at same time. fixes #20638
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-24 21:04:44 -05:00
877e6d76a4
Fix some flaws in man.
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2016-02-25 09:48:21 +08:00
96c79a1934
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>
2016-02-24 20:45:38 -05:00
5a264f2806
Add @aaronlehmann to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-24 17:31:12 -08:00
93ad9c31fc
Close resp body on plugin call error
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-24 20:09:51 -05:00
281c1ced6d
Windows CI: Port docker_cli_restart_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 15:21:56 -08:00
0f01b21702
Merge pull request #20630 from tkopczynski/10084-cmd-entrypoint
...
Docs: add note about CMD and ENTRYPOINT commands
2016-02-25 00:19:30 +01:00
1ed84770c5
Docs: add note about CMD and ENTRYPOINT commands
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-02-24 22:57:25 +01:00
00f65ae810
Windows CI: Port TestLogsAPI*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 13:43:52 -08:00
03e2ff322b
Windows CI: Port TestKill*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 13:33:25 -08:00
c1e53ad1aa
Update security.md with basic User Namespace info.
...
Just some suggested wording to update this page to take account of User Namespaces being available as of 1.10.
Signed-off-by: Rory McCune <rorym@mccune.org.uk>
2016-02-24 20:53:00 +00:00
0f35bb92fe
Add .md extension to readme for markdown rendering
...
Signed-off-by: Nakul Pathak <nakulpathak3@hotmail.com>
2016-02-24 20:39:46 +00:00
1ba44a832f
Make server middleware standalone functions.
...
Removing direct dependencies from the server configuration.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-24 14:48:52 -05:00
6a931c3590
Windows CI: Integrity check for busybox top
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-24 11:00:47 -08:00
a7fefcf16c
Merge pull request #20641 from cpuguy83/revert_inotify_changes
...
Revert fsnotify changes
2016-02-24 10:10:03 -08:00
Antonio Murdaca
Sebastiaan van Stijn
Sebastiaan van Stijn
Brian Goff
David Calavera
Tibor Vass
Tibor Vass
Michael Crosby
Alexander Morozov
Vincent Demeester
Antonio Murdaca
Vincent Bernat
Cameron Spear
Phil Estes
John Howard
Brian Bland
Lei Jitang
Jian Zhang
Arnaud Porterie
Tomasz Kopczynski
Rory McCune
Nakul Pathak