Граф коммитов

22498 Коммитов

Автор SHA1 Сообщение Дата
Arnaud Porterie 2d0c3d1328 Merge pull request #20631 from LK4D4/update_libcontainer
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
2016-02-23 16:24:46 -08:00
John Howard ef9f13af3d Windows CI: Fix TestStartAttachMultipleContainers
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-23 16:24:35 -08:00
Arnaud Porterie a9e6274224 Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests
Fix flaky OOM tests
2016-02-23 15:37:32 -08:00
David Calavera 2ed1806b2c Merge pull request #20610 from justechn/fix_docs
Fix docs
2016-02-23 13:45:29 -08:00
Alexander Morozov 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
Christopher Jones 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
Tibor Vass 9ec015edff Merge pull request #20618 from icecrime/fix_TestExec
Fix flaky TestExec
2016-02-23 13:44:04 -05:00
Ryan McLaughlin d14cef441d 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>
2016-02-23 11:32:28 -07:00
Arnaud Porterie 0a7755ab4e 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>
2016-02-23 09:51:09 -08:00
John Howard 800c9e81ea Windows: Updates for virtual user account
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-23 09:47:52 -08:00
David Calavera bd4fb00fb6 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>
2016-02-23 12:10:24 -05:00
Brian Goff 0f18fa939c Merge pull request #20591 from nerdalert/logrus_dbg_msg
Fixed logrus client/server mismatch debug msg
2016-02-23 11:59:37 -05:00
Vincent Demeester 20fc13b56d Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup
Update docs for enableipv6
2016-02-23 17:57:58 +01:00
David Calavera 9d882cbb44 Merge pull request #20581 from stweil/master
Fix some typos in comments and strings
2016-02-23 08:20:53 -08:00
David Calavera 1e02a0810e Merge pull request #20590 from HackToday/fixdoc
Fix doc format issue
2016-02-23 08:20:03 -08:00
Aidan Hobson Sayers 82d486848d Update docs for enableipv6
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-02-23 16:10:54 +00:00
Sebastiaan van Stijn 98d6dedde3 Merge pull request #20597 from zhuguihua/fix_markdown_style_error_in_man_page
Fix markdown style error in man page
2016-02-23 16:15:46 +01:00
Sebastiaan van Stijn f3b5fdc23d Merge pull request #20514 from calavera/github_templates
Add tempates for new issues and pull requests.
2016-02-23 15:27:52 +01:00
Vincent Demeester 783d6c64cf Merge pull request #20500 from ZJUshuaizhou/master
Update docker_remote_api_v1.22.md
2016-02-23 14:54:01 +01:00
Doug Davis dbec35ffd3 Merge pull request #20598 from wenchma/typo
Fix typo
2016-02-23 07:28:50 -05:00
Wen Cheng Ma 8474bbff45 Fix typo
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-23 17:27:55 +08:00
Zhu Guihua 2aa4280d93 Fix markdown style error in man page
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-02-23 16:10:17 +08:00
ZJUshuaizhou 220a188ae8 update all the versions from v1.19 to v1.23
update v1.22

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update all the versions docs

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>
2016-02-23 14:34:27 +08:00
Brent Salisbury a499ad8e4e Fixed logrus client/server mismatch debug msg
Signed-off-by: Brent Salisbury <brent@docker.com>
2016-02-22 23:36:33 -05:00
Kai Qiang Wu(Kennan) 4d4d1e7f82 Fix doc format issue
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-23 03:42:10 +00:00
Brian Goff 0d808683a1 Merge pull request #20588 from WeiZhang555/typo
Fix typo
2016-02-22 21:30:01 -05:00
Zhang Wei 2264bd95b6 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-23 10:25:24 +08:00
David Calavera 921c744bc3 Merge pull request #20579 from MHBauer/cleanup
consistent variable names in api/server/router
2016-02-22 15:20:48 -08:00
David Calavera 9cac2716f7 Add tempates for new issues and pull requests.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-22 14:59:50 -05:00
Stefan Weil 2eee613326 Fix some typos in comments and strings
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-02-22 20:27:15 +01:00
Morgan Bauer 9021506502
consistent variable names in api/server/router
- banish 'daemon'

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-02-22 10:53:47 -08:00
Brian Goff 40397d8059 Merge pull request #20552 from Microsoft/jjh/dockerfilereliability
Windows CI: Making dockerfile WAAAAAY faster
2016-02-22 13:11:23 -05:00
Vincent Demeester 4a087e4e6b Merge pull request #20557 from hsinko/fix_api_docs
Fix tiny error. And Previous PR missed to update docker_remote_api v1.22 and v1.23
2016-02-22 14:43:50 +01:00
hsinko 5642cdeac5 Update docker_remote_api_v1.22.md and v1.23 to complete the docs
Signed-off-by: hsinko <21551195@zju.edu.cn>

id in example request should be a exact value

Signed-off-by: hsinko <21551195@zju.edu.cn>

revert v1.22 doc

Signed-off-by: hsinko <21551195@zju.edu.cn>

fix tiny errors

Signed-off-by: hsinko <21551195@zju.edu.cn>
2016-02-22 20:49:10 +08:00
Vincent Demeester 5d33ff7e9d Merge pull request #20562 from albers/completion-update--restart
Add bash completion for `docker update --restart`
2016-02-22 13:44:31 +01:00
Vincent Demeester 0542f66823 Merge pull request #20561 from albers/completion-etwlogs
Add bash completion for etwlogs logging driver
2016-02-22 13:42:46 +01:00
Vincent Demeester 074442df7a Merge pull request #20482 from zhuguihua/fix_storage_driver_options_in_man_page
fix storage driver options in man page
2016-02-22 10:40:52 +01:00
Zhu Guihua 13deb4a245 fix storage driver options in man page
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-02-22 17:34:19 +08:00
Harald Albers dd4aa7f0e9 bash completion for `docker update --restart`
Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-21 10:21:28 -08:00
Harald Albers 1cd6b545ec bash completion for etwlogs logging driver
Signed-off-by: Harald Albers <github@albersweb.de>
2016-02-21 09:58:42 -08:00
Vincent Demeester 675617bc85 Merge pull request #20549 from estesp/unskip-authz-events
Unskip authz events test after fixes
2016-02-21 09:32:28 +01:00
Vincent Demeester 1b811a8930 Merge pull request #20541 from tracylihui/20536-fix
Update docker_remote_api_v1.21.md to complete the docs
2016-02-21 09:27:50 +01:00
John Howard c7089b4b46 Windows CI: Making dockerfile WAAAAAY faster
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-20 22:45:08 -08:00
tracylihui cc2ff8c921 Update docs/reference/api to complete the docs
Signed-off-by: tracylihui <793912329@qq.com>
2016-02-21 10:28:07 +08:00
Phil Estes 4781d5c4fb Unskip authz events test after fixes
Now that the various fixes are all committed, let's see if this gets
less flaky now.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-20 20:19:54 -06:00
Vincent Demeester 3646b14ecd Merge pull request #20528 from cloojure/patch-3
Update dockernetworks.md
2016-02-20 23:25:51 +01:00
Vincent Demeester 41a2bac7cf Merge pull request #20542 from longliqiang88/master2.201
Update doc docker_remote_api_v1.20.md
2016-02-20 19:18:28 +01:00
Sebastiaan van Stijn d006e32a91 Merge pull request #20519 from lblackstone/update-packager-readme
Update Packagers readme with seccomp info
2016-02-20 19:17:11 +01:00
longliqiang88 47e3ea7dd1 Update doc docker_remote_api_v1.20.md
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com>
2016-02-20 19:32:20 +08:00
tracylihui df3ede95eb Update docker_remote_api_v1.21.md to complete the docs
Signed-off-by: tracylihui <793912329@qq.com>
2016-02-20 19:17:19 +08:00