3273209a9c
Merge pull request #15075 from hqhq/hq_move_cpushare_change
...
Cleanup: Merge adjustCpuShares to adoptContainerSettings
2015-08-05 21:53:58 -04:00
263220fa30
Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check
...
Remove redundant ip_forward check
2015-08-05 18:52:44 -07:00
af9dc3050b
Merge pull request #15353 from jlhawn/fixing-concurrency-trust
...
[graph] Use a pipe for downloads to write progress
2015-08-05 18:52:27 -07:00
6805241fe2
Merge pull request #15352 from icecrime/fix_pause_tests
...
Use busybox in 'pause' tests
2015-08-06 03:14:44 +02:00
d80c4244d3
[graph] Use a pipe for downloads to write progress
...
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.
This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-08-05 18:13:39 -07:00
6a0050d0f0
Remove redundant ip_forward check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-06 09:06:31 +08:00
efe4f0dfa9
Merge pull request #15119 from xnox/sdnotify
...
systemd: set service type to notify.
2015-08-05 17:42:58 -07:00
3529e3dac7
Use busybox in 'pause' tests
...
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-05 17:35:20 -07:00
e0af23dc18
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-06 08:15:14 +08:00
044c4e00a0
Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
...
image_delete: move name check first
2015-08-06 02:07:34 +02:00
8534090476
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
2015-08-05 19:27:48 -04:00
d93eca2250
Merge pull request #15345 from calavera/fix_ps_format_error
...
Fail fail when the ps format template is invalid.
2015-08-05 19:19:33 -04:00
a8e67849b9
Merge pull request #15001 from fmoliveira/master
...
Adding support for elementary OS distro in install script.
2015-08-05 16:14:47 -07:00
565535073f
Merge pull request #15346 from Microsoft/minortypo
...
Minor typo in test-and-docs.md
2015-08-05 22:27:18 +02:00
b5eea8f33b
Minor typo in test-and-docs.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 13:22:39 -07:00
3d3db0d4af
Fail fail when the ps format template is invalid.
...
Fixes error continuing execution when the parsing fails.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-05 13:22:24 -07:00
aec46ac0b2
Merge pull request #15336 from Microsoft/fixwindowsci
...
Windows: Fix for CI
2015-08-05 13:11:59 -07:00
ac120567e8
Windows: Workaround for CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 11:20:30 -07:00
cb2def9f90
image_delete: move name check first
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-06 00:27:45 +08:00
6206cbe193
Merge pull request #15305 from vdemeester/contribution-docs-updates
...
Update some contributions documentations
2015-08-05 08:46:53 -07:00
a15b676ee1
Merge pull request #15318 from Microsoft/10662-fixmasteragain
...
Windows: Fix docker/master daemon compile again
2015-08-05 08:32:12 -04:00
67e670b79f
Windows: Fix docker/master daemon compile again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-04 19:32:05 -07:00
7374852be9
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
2015-08-04 19:16:13 -07:00
b985dca578
Merge pull request #15241 from vdemeester/api-test-coverage
...
Add more unit tests (coverage) to package api
2015-08-04 18:41:35 -07:00
2c3cd949c8
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
2015-08-04 18:41:02 -07:00
7b077c16d6
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
2015-08-04 18:40:32 -07:00
f618de1543
Adding support to forked distributions in installer script.
...
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br >
2015-08-04 21:33:48 -03:00
58121c59ff
Merge pull request #15304 from jfrazelle/only-sign-files-changes-within-last-2-hours
...
only sign the files that were changed in the last 2 hours
2015-08-04 14:16:20 -07:00
63940145a4
Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
...
Windows: Daemon compile was broken
2015-08-04 16:48:11 -04:00
efd47654dd
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-04 13:16:57 -07:00
d4d3504122
Merge pull request #15301 from jfrazelle/fix-systemd-docs
...
update systemd article to reference dropin file
2015-08-04 22:12:36 +02:00
b304920021
Update some contributions documentations
...
- Add a golint entry to coding-style.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-04 22:04:11 +02:00
fe8cfc5b39
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-04 12:42:41 -07:00
23dab01ed2
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
2015-08-04 20:57:39 +02:00
e27c904b99
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-04 18:30:55 +00:00
35e7a7c3e2
update systemd article to reference dropin file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-04 11:03:43 -07:00
f7e43d45b3
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-04 19:51:02 +02:00
a4ddf0e362
Update runc to v0.0.3
...
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-04 10:47:59 -07:00
0f49141150
Merge pull request #15300 from l0rd/test-and-docs-fix
...
Removed `docs-test` from Makefile rules list
2015-08-04 19:41:48 +02:00
c4b9884ab5
Merge pull request #15260 from albers/completion-config
...
Add `--config` to bash completion
2015-08-04 10:14:15 -07:00
2c6fa8375b
Merge pull request #15291 from duglin/FixInspectExecId
...
Another try to fix InspectExecID
2015-08-04 10:13:42 -07:00
fe6a7c8e57
Another try to fix InspectExecID
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-08-04 09:21:41 -07:00
c5e0ea02f7
Merge pull request #15297 from lerignoux/15296-updating-docs-README-new-md-file
...
Removing deprecated notice to update mkdocs.yml in docs README
2015-08-04 09:04:21 -07:00
5237670b5b
Removed docs-test from Makefile rules list
...
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com >
2015-08-04 15:57:42 +00:00
be07c53d2d
Merge pull request #15259 from sallyom/manFixes
...
make man/docker.1.md consistent with docker --help
2015-08-04 08:34:52 -07:00
ac1794d3e2
Removing deprecated notice to update mkdocs.yml in docs README
...
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com >
2015-08-04 15:15:46 +02:00
bc12094251
Merge pull request #15236 from charleswhchan/patch-1
...
Fix #15212 : Add "Label" key to output of /containers/json
2015-08-04 21:48:39 +10:00
c26c1eb8ba
Merge pull request #15278 from campoy/14558-break-long-command
...
Break long command to avoid cropping
2015-08-04 08:27:55 +02:00
ba332b7d12
Enable golint in pkg/arcive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-04 09:52:54 +08:00
16b5b6e49f
Break long command to avoid cropping
...
Fixes docker/docker#14558
Signed-off-by: Francesc Campoy <campoy@google.com >
2015-08-03 18:36:32 -07:00
Tibor Vass