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
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
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
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
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
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
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
9e37627565
Merge pull request #20643 from estesp/userns-chkconfig-redhat
...
Add check for RHEL7/CentOS7 experimental userns disabled
Upstream-commit: 2cc54a2e5735aa052884fce2e6674285c3853473
Component: engine
2016-02-24 11:42:26 +01:00
34876f5fef
Merge pull request #20017 from calavera/expose_volumes_in_ps
...
Add mounts to docker ps.
Upstream-commit: 034a1a8dfd17d89123bf0405f898e880575ed775
Component: engine
2016-02-24 11:08:21 +01:00
71bd1b6405
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)
Upstream-commit: 23551515564b54128e882dda5eae659883947d39
Component: engine
2016-02-23 23:28:24 -06:00
0a8b8e629c
Revert "use pubsub instead of filenotify to follow json logs"
...
This reverts commit b1594c59f5e0d1ac898eacde8d91b1ba33c2b626.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 91fdfdd53722179b21b80b9dfbe8bc2e09d0a7b1
Component: engine
2016-02-23 21:43:52 -05:00
165355ea85
Revert "pkg: remove unused filenotify"
...
This reverts commit ee99b5f2e96aafa982487aadbb78478898ae0c71.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f78091897a9926399224886788c373b4ff9d14bf
Component: engine
2016-02-23 21:43:46 -05:00
19b1f464fe
Revert "vendor: remove fsnotify"
...
This reverts commit bc195e1558d3091dccb209f1bb35115248886c7a.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d3bffa1639655b9d0f96b8ef4b1842663e7d2741
Component: engine
2016-02-23 21:43:27 -05:00
8a6f94c5b2
Merge pull request #20631 from LK4D4/update_libcontainer
...
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
Upstream-commit: 2d0c3d1328cf1f10a4f4db7015e4ff1c9f7779ae
Component: engine
2016-02-23 16:24:46 -08:00
ca915e8020
Windows CI: Fix TestStartAttachMultipleContainers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ef9f13af3d9293458a03223a030028381da4ae09
Component: engine
2016-02-23 16:24:35 -08:00
271b18177c
Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests
...
Fix flaky OOM tests
Upstream-commit: a9e627422458a530a9af8fd01d7838eec51b03ab
Component: engine
2016-02-23 15:37:32 -08:00
d7e2b23289
Merge pull request #20610 from justechn/fix_docs
...
Fix docs
Upstream-commit: 2ed1806b2c563e2276d81066cc492aaf7bcb145b
Component: engine
2016-02-23 13:45:29 -08:00
ee3aee350a
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
...
It includes fix for parsing systemd cgroup names
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 4fc5bd295eedbefe1b429d98be52f794f1461f2f
Component: engine
2016-02-23 13:37:20 -08:00
15f2e840f7
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 >
Upstream-commit: 3abf2a77414195d5b0c15f7fc88b7fd9aa4edaa8
Component: engine
2016-02-23 15:26:26 -05:00
e61c546929
fixing the path of the key pair
...
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com >
Fixed a bit of grammar
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com >
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
2016-02-23 11:32:28 -07:00
c1d2fd21f7
Fix flaky TestExec
...
The container started with `-d` as part of the test requires a `waitRun`
to ensure it is actually running before attempting any other operation.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 0a7755ab4e2fc8df1992813d5364fe0f201ab913
Component: engine
2016-02-23 09:51:09 -08:00
e1a3cdb877
Windows: Updates for virtual user account
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f
Component: engine
2016-02-23 09:47:52 -08:00
edf220176a
Add mounts to docker ps.
...
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: bd4fb00fb6241d35537b460a2d9f48256111ae7a
Component: engine
2016-02-23 12:10:24 -05:00
cecf6d8a1a
Merge pull request #20591 from nerdalert/logrus_dbg_msg
...
Fixed logrus client/server mismatch debug msg
Upstream-commit: 0f18fa939c18da5fd7385d25f10666fe486704b1
Component: engine
2016-02-23 11:59:37 -05:00
5ff2aad20c
Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup
...
Update docs for enableipv6
Upstream-commit: 20fc13b56deb4fc28cbd40ae3c67e5ca2dd9592a
Component: engine
2016-02-23 17:57:58 +01:00
39d894b6e8
Merge pull request #20581 from stweil/master
...
Fix some typos in comments and strings
Upstream-commit: 9d882cbb442138cb5c9026f1ec8eb4499ad71442
Component: engine
2016-02-23 08:20:53 -08:00
15b7542c40
Merge pull request #20590 from HackToday/fixdoc
...
Fix doc format issue
Upstream-commit: 1e02a0810ee51ec7fa572f9e35ba36cd32d7a083
Component: engine
2016-02-23 08:20:03 -08:00
