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
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
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
13fc2a2541
Update docs for enableipv6
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 82d486848dd2e7a0189375a62e8e38171ba9a2b1
Component: engine
2016-02-23 16:10:54 +00:00
afe701cabe
Merge pull request #20597 from zhuguihua/fix_markdown_style_error_in_man_page
...
Fix markdown style error in man page
Upstream-commit: 98d6dedde39902e15def644ca70be8fecef9758d
Component: engine
2016-02-23 16:15:46 +01:00
2c0688c9b3
Merge pull request #20514 from calavera/github_templates
...
Add tempates for new issues and pull requests.
Upstream-commit: f3b5fdc23db46abaf6ec7aa731d639cbc15f0921
Component: engine
2016-02-23 15:27:52 +01:00
11a259a09b
Merge pull request #20500 from ZJUshuaizhou/master
...
Update docker_remote_api_v1.22.md
Upstream-commit: 783d6c64cfd1a413cd8ce500611d0aa23ded8cb1
Component: engine
2016-02-23 14:54:01 +01:00
f04054d6f5
Fix typo
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 8474bbff4594f382dbac5ad59767d18b2d8f2689
Component: engine
2016-02-23 17:27:55 +08:00
42f2e41e4a
Fix markdown style error in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com >
Upstream-commit: 2aa4280d936b6680dedbe3a3ebf34f8640626306
Component: engine
2016-02-23 16:10:17 +08:00
c78bf4e1c8
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 >
Upstream-commit: 220a188ae820fac1198c54b7f0358525457a8609
Component: engine
2016-02-23 14:34:27 +08:00
b49176ac83
Fixed logrus client/server mismatch debug msg
...
Signed-off-by: Brent Salisbury <brent@docker.com >
Upstream-commit: a499ad8e4e596d21167347437a2ca3098cbadc45
Component: engine
2016-02-22 23:36:33 -05:00
d01d130fdc
Fix doc format issue
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 4d4d1e7f82592c4996650b92b01d9f4633e8878b
Component: engine
2016-02-23 03:42:10 +00:00
0a2d56c7a2
Merge pull request #20588 from WeiZhang555/typo
...
Fix typo
Upstream-commit: 0d808683a1e1a7c9971d2b943028d0a621d2eb21
Component: engine
2016-02-22 21:30:01 -05:00
ce26dfb6b0
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 2264bd95b681d1336b167c8ecd9b2ce65b963071
Component: engine
2016-02-23 10:25:24 +08:00
cef2f0b8f9
Merge pull request #20579 from MHBauer/cleanup
...
consistent variable names in api/server/router
Upstream-commit: 921c744bc3b3ed2ae22cf460422604730dc5ae22
Component: engine
2016-02-22 15:20:48 -08:00
239fee91e2
Add tempates for new issues and pull requests.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9cac2716f7196fc915c4cac3b2c34aa2183182d9
Component: engine
2016-02-22 14:59:50 -05:00
f62b97e499
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de >
Upstream-commit: 2eee613326fb59fd168849618d14a9054a40f9f5
Component: engine
2016-02-22 20:27:15 +01:00
583166cc10
consistent variable names in api/server/router
...
- banish 'daemon'
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 90215065024aea1001e42e7a427248630b4a1115
Component: engine
2016-02-22 10:53:47 -08:00
5cbc7c5628
Merge pull request #20552 from Microsoft/jjh/dockerfilereliability
...
Windows CI: Making dockerfile WAAAAAY faster
Upstream-commit: 40397d8059594ac58250f66f93f4c28455433242
Component: engine
2016-02-22 13:11:23 -05:00
4baeda8a40
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 >
Upstream-commit: 5642cdeac5df08414744203235462a6b99261239
Component: engine
2016-02-22 20:49:10 +08:00
15ccd7ba01
Merge pull request #20562 from albers/completion-update--restart
...
Add bash completion for `docker update --restart`
Upstream-commit: 5d33ff7e9d6703df9ac658d8aa6f253a6bb1ae32
Component: engine
2016-02-22 13:44:31 +01:00
5b0eb0d2e2
Merge pull request #20561 from albers/completion-etwlogs
...
Add bash completion for etwlogs logging driver
Upstream-commit: 0542f66823d1f8043f3ba352e8b71957032f92e6
Component: engine
2016-02-22 13:42:46 +01:00
82ec31ffc1
fix storage driver options in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com >
Upstream-commit: 13deb4a245ce508c8eb6bbe065d0f560472c68e2
Component: engine
2016-02-22 17:34:19 +08:00
0dd117f97d
bash completion for docker update --restart
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dd4aa7f0e97f1bcd4e851cefdf16bc9067b7e42a
Component: engine
2016-02-21 10:21:28 -08:00
83683b4a36
bash completion for etwlogs logging driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1cd6b545ec137b225c821783c63ce57c5a27486a
Component: engine
2016-02-21 09:58:42 -08:00
f3978cfd1e
Merge pull request #20549 from estesp/unskip-authz-events
...
Unskip authz events test after fixes
Upstream-commit: 675617bc857910fd3f512f21a7c6ff160d99cd1d
Component: engine
2016-02-21 09:32:28 +01:00
13999a8cee
Merge pull request #20541 from tracylihui/20536-fix
...
Update docker_remote_api_v1.21.md to complete the docs
Upstream-commit: 1b811a8930d32e9fe984031918b397b6538f5f74
Component: engine
2016-02-21 09:27:50 +01:00
d59617c5ea
Windows CI: Making dockerfile WAAAAAY faster
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c7089b4b469e0a536a260c136ef71bc95591fa51
Component: engine
2016-02-20 22:45:08 -08:00
a78e8052d0
Update docs/reference/api to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: cc2ff8c9215e445d2504b0e4916233f72a257ee6
Component: engine
2016-02-21 10:28:07 +08:00
dce4ee668d
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)
Upstream-commit: 4781d5c4fb06d4617189f2e8a9475abcc5c5c8f3
Component: engine
2016-02-20 20:19:54 -06:00
6da923628b
Merge pull request #20528 from cloojure/patch-3
...
Update dockernetworks.md
Upstream-commit: 3646b14ecd9c07d9d4113b5a36958d3f92484806
Component: engine
2016-02-20 23:25:51 +01:00
67a6fa7a29
Merge pull request #20542 from longliqiang88/master2.201
...
Update doc docker_remote_api_v1.20.md
Upstream-commit: 41a2bac7cfce743b1acdd415213bd12cede6fd29
Component: engine
2016-02-20 19:18:28 +01:00
3f61927c82
Merge pull request #20519 from lblackstone/update-packager-readme
...
Update Packagers readme with seccomp info
Upstream-commit: d006e32a91a178ae16b28177d6f4bf1462f76545
Component: engine
2016-02-20 19:17:11 +01:00
b76e5dced0
Update doc docker_remote_api_v1.20.md
...
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com >
Upstream-commit: 47e3ea7dd1a08abc86d1ef0e32b71248a0eac95e
Component: engine
2016-02-20 19:32:20 +08:00
1da6a4053e
Update docker_remote_api_v1.21.md to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: df3ede95ebdc708ea6fb954c8799cf14203916c2
Component: engine
2016-02-20 19:17:19 +08:00
4ea7e9ea28
Merge pull request #20509 from estesp/cleanup-authz-test
...
Clean up authz integration-cli test
Upstream-commit: 076b3558fcf4cc77694fe53f4aae65137ed3ef1b
Component: engine
2016-02-20 12:10:29 +01:00
5666b58bae
Merge pull request #20535 from hsinko/dev
...
A wrong word
Upstream-commit: dc0a69cbcdd2b782ee660a72e9eac989371872de
Component: engine
2016-02-20 11:57:29 +01:00
f153cf13ed
Update RestartPolicy of container
...
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c
Component: engine
2016-02-20 17:06:32 +08:00
d560df1e09
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
2016-02-20 11:51:59 +08:00
7b8239e00e
Merge pull request #20471 from calavera/userland_proxy_config_fix
...
Avoid setting default truthy values from flags that are not set.
Upstream-commit: 6668326aa8cbb8af32bb49b4a843be2cae762cb3
Component: engine
2016-02-19 21:00:37 -05:00
a4f9e19fdf
Update dockernetworks.md
...
Fix truncated sentence
Signed-off-by: Alan Thompson <cloojure@gmail.com >
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
2016-02-19 16:57:13 -08:00
2d2a092a9b
Merge pull request #20446 from estesp/fix-userns-cp
...
Fix copy chown settings to not default to real root
Upstream-commit: 3d65e7126c60ef23a7f0e255cd2e4b5938859413
Component: engine
2016-02-19 19:45:44 -05:00
f30528fead
Allow post-start load of busybox to remove restarts
...
The restarts in the authz plugin test suite seems to be causing
flakiness in CI, and can be avoided by separating the daemon start and
busybox image load.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: fe015c5ce0a260a8b5bc346a297507ac91f0ccb4
Component: engine
2016-02-19 18:44:36 -06:00
John Howard
Arnaud Porterie
David Calavera
Christopher Jones
Ryan McLaughlin
Brian Goff
Vincent Demeester
Aidan Hobson Sayers
Sebastiaan van Stijn
Wen Cheng Ma
Zhu Guihua
ZJUshuaizhou
Brent Salisbury
Kai Qiang Wu(Kennan)
Zhang Wei
Stefan Weil
Morgan Bauer
hsinko
Harald Albers
tracylihui
Phil Estes
longliqiang88
Antonio Murdaca
hsinko
Tibor Vass
Alan Thompson