189d2c7985
Update libcontainer to aac9179bbadbf958054ce97ab36
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-09-24 15:00:31 -07:00
f6064cb42b
Update CAP_ prefix for new spec format
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-09-24 15:00:30 -07:00
d0fdc3b5df
Fix netlink dependency with new pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-09-24 15:00:30 -07:00
6bd3e6357c
Bump libcontainer to 08b5415ffa3769ff7c1d2f673f613
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-09-24 15:00:30 -07:00
de41640435
Merge pull request #16228 from duglin/ContextualizeEvents
...
Add context.RequestID to event stream
2015-09-24 14:16:22 -07:00
7daeecd42d
Merge pull request #16559 from Microsoft/10662-fix16556
...
Fixes 16556 CI failures
2015-09-24 12:31:36 -07:00
84b53c8d87
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
2015-09-24 12:11:36 -07:00
a7e8f3616c
Merge pull request #16511 from Mashimiao/fix-logic-client-search
...
client/search: small logic fix
2015-09-24 15:06:10 -04:00
26b1064967
Add context.RequestID to event stream
...
This PR adds a "request ID" to each event generated, the 'docker events'
stream now looks like this:
```
2015-09-10T15:02:50.000000000-07:00 [reqid: c01e3534ddca] de7c5d4ca927253cf4e978ee9c4545161e406e9b5a14617efb52c658b249174a: (from ubuntu) create
```
Note the `[reqID: c01e3534ddca]` part, that's new.
Each HTTP request will generate its own unique ID. So, if you do a
`docker build` you'll see a series of events all with the same reqID.
This allow for log processing tools to determine which events are all related
to the same http request.
I didn't propigate the context to all possible funcs in the daemon,
I decided to just do the ones that needed it in order to get the reqID
into the events. I'd like to have people review this direction first, and
if we're ok with it then I'll make sure we're consistent about when
we pass around the context - IOW, make sure that all funcs at the same level
have a context passed in even if they don't call the log funcs - this will
ensure we're consistent w/o passing it around for all calls unnecessarily.
ping @icecrime @calavera @crosbymichael
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-24 11:56:37 -07:00
23750fb802
Merge pull request #15862 from calavera/share_shm_and_mqueue
...
Share shm and mqueue between containers.
2015-09-24 11:23:59 -07:00
e65a7dabb9
Fixes 16556 CI failures
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-24 11:19:00 -07:00
c8bc02ea35
Merge pull request #16538 from Microsoft/10662-escapeargs
...
Windows: Fixed escaping of command line arguments
2015-09-24 11:18:29 -07:00
ccba7c3e14
Merge pull request #16507 from azurezk/testcase_nit
...
TestInspectInt64 to be neat
2015-09-24 11:12:43 -07:00
f2db5028cd
Merge pull request #16480 from sunyuan3/TestRunWithKernelMemory
...
update TestRunWithKernelMemory
2015-09-24 11:10:51 -07:00
de8b5c46cc
Merge pull request #16556 from Microsoft/10662-randomunix
...
Make 'TestRandomUnixTmpDirPath' platform agnostic
2015-09-24 10:35:27 -07:00
f75206dd7b
Merge pull request #16541 from sunyuan3/newlogformat
...
Update documentation for new test log format
2015-09-24 10:07:20 -07:00
1e514de2e4
Merge pull request #16545 from HuKeping/fixtest
...
Fix test for container events
2015-09-24 12:43:51 -04:00
5d630abbab
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-24 09:37:07 -07:00
5505bcdd62
Fix test for container events
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-24 19:04:54 +08:00
8c33c6c737
Merge pull request #16190 from LK4D4/drain_refactor
...
Refactoring of bufReader
2015-09-24 01:54:40 -07:00
19613feddf
client/search: small logic fix
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-24 11:11:03 +08:00
029c6eacd6
test neat
...
Signed-off-by: Kun Zhang <zkazure@gmail.com>
2015-09-24 10:55:47 +08:00
22877e1b16
Merge pull request #15021 from chenchun/resize_pool
...
Try to resize data and metadata loopback file when initiating devicemapper
2015-09-23 22:22:51 -04:00
6fe38e3947
Update documentation for new test log format.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-24 09:47:42 +08:00
2458452a3b
Try to resize data and metadata loopback file when initiating devicemapper
...
Signed-off-by: Chun Chen <ramichen@tencent.com>
2015-09-24 09:31:00 +08:00
ebe7ef9fc2
Merge pull request #16411 from duglin/DaemonErrors
...
Move more 'daemon' errors to the new error package
2015-09-23 21:20:56 -04:00
40e8560412
Merge pull request #16415 from HuKeping/dockerinfo
...
Format output of docker info
2015-09-23 21:15:23 -04:00
a518612260
Merge pull request #16540 from MHBauer/man-build-arg
...
fix typo in man page
2015-09-23 17:51:09 -07:00
3a4775cb80
fix typo in man page
...
- resolve #16536
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-09-23 17:41:52 -07:00
b89fdc120e
update TestRunWithKernelMemory
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-24 08:41:35 +08:00
c5b23337c3
Make bytesPipe use linear allocations
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-09-23 17:12:54 -07:00
ddd0c47412
Merge pull request #16497 from MHBauer/attach-refactor-new
...
refactor attach to not use internal data structures
2015-09-23 16:52:39 -07:00
d71ae45772
Merge pull request #16484 from HuKeping/history-format
...
Format the output of docker history
2015-09-23 16:52:21 -07:00
ca5cc770b9
Windows: Fixed escaping of command line arguments
...
This fixes some tests that were failing on windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-09-23 16:35:44 -07:00
a1573dffee
Merge pull request #16494 from calavera/fix_plugin_url_scheme
...
Do not hardcode http as plugin URL scheme for secure connections.
2015-09-23 16:18:00 -07:00
793a409081
Merge pull request #16504 from brahmaroutu/ImageErrors
...
Adding error codes to image package
2015-09-23 19:15:25 -04:00
56b70bf84e
Refactor bufReader to use BytesPipe
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-23 16:00:28 -07:00
24310b5b4a
Add BytesPipe datastructure to ioutils
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-23 16:00:27 -07:00
01670bec48
Merge pull request #16517 from coolljt0725/show_help_all_the_time
...
Clean up: show usage when global --help present
2015-09-23 18:58:19 -04:00
323c77e4e1
Merge pull request #16371 from coolljt0725/docs_update_contributing
...
Docs: update the CONTRIBUTING.md
2015-09-23 15:56:13 -07:00
04b171a632
Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverage
...
Adding some more coverage to StdCopy to address #11584
2015-09-23 15:51:21 -07:00
51fad49e67
Merge pull request #16502 from Microsoft/10662-cpuweight
...
Windows: [TP4] Add CPU Weight
2015-09-23 15:41:35 -07:00
a077c46d14
Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
...
Docs: correct the description of docker cp
2015-09-23 15:40:58 -07:00
40adb3fd2c
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
2015-09-23 15:38:38 -07:00
c0c941627a
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
2015-09-23 15:29:48 -07:00
871daf5498
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
2015-09-23 15:29:06 -07:00
200fa6978c
Merge pull request #16518 from unclejack/bump_go_to_1.4.3
...
Dockerfile: bump Go to 1.4.3
2015-09-23 15:21:06 -07:00
78de066a28
fix content-type of response for `/commit`
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2015-09-23 23:49:16 +02:00
8d69e0eae0
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
2015-09-23 17:20:34 -04:00
8f8cc077d3
Merge pull request #16525 from icecrime/fix_integration_cli
...
Fix integration cli
2015-09-23 13:52:28 -07:00
Michael Crosby
David Calavera
Jess Frazelle
Phil Estes
Doug Davis
John Howard
Arnaud Porterie
Doug Davis
Hu Keping
Ma Shimiao
Kun Zhang
Brian Goff
Yuan Sun
Chun Chen
Morgan Bauer
Tonis Tiigi
Darren Stahl
Alexandre Beslic
Tibor Vass
Alexander Morozov
Tobias Gesellchen