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
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
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
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
467c8b1a6a
Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers
...
Windows CI: Fix TestStartAttachMultipleContainers
2016-02-24 08:46:00 -08:00
f9524a4d24
add file poller panic fix from 1.10.2
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-02-24 10:17:29 -05:00
efb915800a
Merge pull request #20649 from runcom/fedora-update-userns
...
docs: reference: commandline: daemon: fedora 23+ has mapping files
2016-02-24 16:04:02 +01:00
eb902ef257
docs: reference: commandline: daemon: fedora 23+ has mapping files
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-24 15:43:28 +01:00
afde6450ee
resolve the config file from the sudo user
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-24 15:41:00 +01:00
5fdfb2985b
Merge pull request #20619 from Microsoft/jjh/useraccounts
...
Windows: Updates for virtual user account
2016-02-24 13:48:27 +01:00
2cc54a2e57
Merge pull request #20643 from estesp/userns-chkconfig-redhat
...
Add check for RHEL7/CentOS7 experimental userns disabled
2016-02-24 11:42:26 +01:00
034a1a8dfd
Merge pull request #20017 from calavera/expose_volumes_in_ps
...
Add mounts to docker ps.
2016-02-24 11:08:21 +01:00
2355151556
Add check for RHEL7/CentOS7 experimental userns disabled
...
Add a check in `check-config.sh` to see if we are running on a RHEL7 or
CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but
user namespaces still won't work because of the experimental feature
flag added by Redhat.
This will add a warning if it is actually disabled and notes what has to
be added to the grub/boot command line to enable it.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-23 23:28:24 -06:00
91fdfdd537
Revert "use pubsub instead of filenotify to follow json logs"
...
This reverts commit b1594c59f5
2016-02-23 21:43:52 -05:00
f78091897a
Revert "pkg: remove unused filenotify"
...
This reverts commit ee99b5f2e9
2016-02-23 21:43:46 -05:00
d3bffa1639
Revert "vendor: remove fsnotify"
...
This reverts commit bc195e1558
2016-02-23 21:43:27 -05:00
2d0c3d1328
Merge pull request #20631 from LK4D4/update_libcontainer
...
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
2016-02-23 16:24:46 -08:00
ef9f13af3d
Windows CI: Fix TestStartAttachMultipleContainers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-23 16:24:35 -08:00
a9e6274224
Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests
...
Fix flaky OOM tests
2016-02-23 15:37:32 -08:00
2ed1806b2c
Merge pull request #20610 from justechn/fix_docs
...
Fix docs
2016-02-23 13:45:29 -08:00
4fc5bd295e
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
...
It includes fix for parsing systemd cgroup names
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-23 13:37:20 -08:00
3abf2a7741
Fix flaky OOM tests
...
If cgroup swap memory limit isn't enabled, then
the -m flag doesn't work and the container that is created for
both of these tests is very large. Because we are trying to run the
containers out of memory, this takes a very long time and causes the
tests to fail most of the time.
Follow-up to #17913
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-02-23 15:26:26 -05:00
Alexander Morozov
Vincent Demeester
Antonio Murdaca
Vincent Bernat
Sebastiaan van Stijn
Cameron Spear
Phil Estes
John Howard
David Calavera
Lei Jitang
Jian Zhang
Brian Goff
Arnaud Porterie
Tomasz Kopczynski
Nakul Pathak
Antonio Murdaca
Alexander Morozov
Christopher Jones