efe044b445
Windows - make docker cp functional
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Conflicts:
pkg/archive/copy.go
Make it compile
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2a237615c0915b60b8dc6c13a377bb766780ecbf
Component: engine
2015-08-06 11:22:38 -07:00
e3faf36a82
Merge pull request #15361 from hqhq/hq_use_docker_daemon
...
Use docker daemon for intergation test daemon start
Upstream-commit: c471b7aba50f5034bf44853b1dd3520bd02391ac
Component: engine
2015-08-06 10:40:49 -07:00
79a2fad9ef
Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify
...
Adapt container settings after verify platform container settings.
Upstream-commit: 33ed76b0f79e639e9ad3d35ee39afa3d9216c500
Component: engine
2015-08-06 10:16:54 -07:00
973372c692
Merge pull request #15240 from vdemeester/cliconfig-test-coverage
...
Add unit test (coverage) to package cliconfig
Upstream-commit: 4640c4abe8c8893fb12f1adbd4089de473c78657
Component: engine
2015-08-06 13:16:04 -04:00
d1cc5964d9
Merge pull request #15330 from runcom/refactor-pkg-systemd
...
Vendor go-systemd daemon and refactor pkg systemd
Upstream-commit: f6106fc3ceaee0389a69e082f99ef531e5c67824
Component: engine
2015-08-06 10:02:04 -07:00
729643faab
Add unit test to pkg cliconfig (and thus coverage)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 73ad1b267420f36ab68a0eff524cc2181a788b98
Component: engine
2015-08-06 18:02:25 +02:00
a1b4849c0d
Merge pull request #15213 from Microsoft/10662-cliwindowsdaemon
...
Windows: Test infrastructure plumbing
Upstream-commit: 57c8f4244b6e6093ceeb58ac6ca53b2b95b26e2d
Component: engine
2015-08-06 11:25:22 -04:00
23d0cda657
Remove pkg/systemd
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 931645c46056ae24b2df51c447b6df1a66b2ca30
Component: engine
2015-08-06 14:35:00 +02:00
d8e23349e8
Vendor coreos/go-systemd/daemon
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 61c9f4db4140be5abdc0e3dc0d2284420a8c6c28
Component: engine
2015-08-06 14:34:40 +02:00
18046b8656
Adapt container settings after verify platform container settings.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 08b3dc8d9f11e42e1ef6dc7a5b5ee70dd5b55306
Component: engine
2015-08-06 19:56:51 +08:00
9733f459f8
Use docker daemon for intergation test daemon start
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b8a8ac9b58404d04a5483de4ea75bf2de3dd5fe1
Component: engine
2015-08-06 16:20:57 +08:00
70f70bf8d8
Merge pull request #15335 from moxiegirl/boot2docker-remove-refs
...
Boot2Docker Cleanup
Upstream-commit: ad5355151ce233388df0d5b8a1c3b3e7a6ba9077
Component: engine
2015-08-06 08:48:57 +02:00
748adf137d
Merge pull request #15313 from Microsoft/10662-fixcertdir
...
Windows: [TP3] Fix certificate directory for registry
Upstream-commit: 5b289cd1aaf81c8d147a27b4af50c61f9e3cbc1b
Component: engine
2015-08-05 22:59:51 -04:00
26a62f2497
- Remove references to sudo in basics.md; see sudo instructions top of file
...
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: cc375a1e48d0f4b3855e7f14b09ead244bbbadfb
Component: engine
2015-08-05 19:45:43 -07:00
bf6ea4035c
Merge pull request #15075 from hqhq/hq_move_cpushare_change
...
Cleanup: Merge adjustCpuShares to adoptContainerSettings
Upstream-commit: 3273209a9cbd09d181e7f80df8236e7ea8d8a38e
Component: engine
2015-08-05 21:53:58 -04:00
b34758fee9
Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check
...
Remove redundant ip_forward check
Upstream-commit: 263220fa3067f7565062983a3e056c7b6e7eee2e
Component: engine
2015-08-05 18:52:44 -07:00
84f01a56ed
Merge pull request #15353 from jlhawn/fixing-concurrency-trust
...
[graph] Use a pipe for downloads to write progress
Upstream-commit: af9dc3050bd17a4b2fa3e05835b39c865f6bdc31
Component: engine
2015-08-05 18:52:27 -07:00
a2702aceb2
Merge pull request #15352 from icecrime/fix_pause_tests
...
Use busybox in 'pause' tests
Upstream-commit: 6805241fe2a41dac88b45879eac9c013341f6f04
Component: engine
2015-08-06 03:14:44 +02:00
fc48931914
[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)
Upstream-commit: d80c4244d322fe0a9cbdd996d23e37fb5b089544
Component: engine
2015-08-05 18:13:39 -07:00
9d17a532e6
Remove redundant ip_forward check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 6a0050d0f0600cf17c0fe5dcca0d24d65e70d818
Component: engine
2015-08-06 09:06:31 +08:00
b5f711f36e
Merge pull request #15119 from xnox/sdnotify
...
systemd: set service type to notify.
Upstream-commit: efe4f0dfa92b6de558f3b46adc6e12e777a5ca30
Component: engine
2015-08-05 17:42:58 -07:00
b8e884831a
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 >
Upstream-commit: 3529e3dac78a18df46d4010a58c9f9d741b42fab
Component: engine
2015-08-05 17:35:20 -07:00
3ec8bc1fa3
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: e0af23dc18eac17633ab1f2541f26b56c303a18c
Component: engine
2015-08-06 08:15:14 +08:00
a9c377d5a8
Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
...
image_delete: move name check first
Upstream-commit: 044c4e00a0688f710d3b37bfb54d711f6955068d
Component: engine
2015-08-06 02:07:34 +02:00
9d9a4fd0c0
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
Upstream-commit: 8534090476b6eae66f1eca81e8bc0e0c61ed7197
Component: engine
2015-08-05 19:27:48 -04:00
43b0434b22
Merge pull request #15345 from calavera/fix_ps_format_error
...
Fail fail when the ps format template is invalid.
Upstream-commit: d93eca2250bd89ca57e29f25268c1774eb34875f
Component: engine
2015-08-05 19:19:33 -04:00
245054e124
Merge pull request #15001 from fmoliveira/master
...
Adding support for elementary OS distro in install script.
Upstream-commit: a8e67849b98e14ac11e2114ba477e239a617be05
Component: engine
2015-08-05 16:14:47 -07:00
2bbb5f5c44
Windows: Test infrastructure plumbing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: da44d0fccba3ace90face348a415632dee75d14e
Component: engine
2015-08-05 14:34:32 -07:00
d750e0c75b
Windows: Fix certificate directory for registry
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 831b00303f1979dda6ed66980fc32a65f9229768
Component: engine
2015-08-05 13:25:41 -07:00
ef703e5bbc
Minor typo in test-and-docs.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b5eea8f33b20bf480bc7c496b12818483dffb96b
Component: engine
2015-08-05 13:22:39 -07:00
82b6f1602c
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 >
Upstream-commit: 3d3db0d4af6cf483299a152133f19f9df760dc11
Component: engine
2015-08-05 13:22:24 -07:00
9416fd6ce9
Windows: Workaround for CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
2015-08-05 11:20:30 -07:00
9e664dc6de
image_delete: move name check first
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: cb2def9f906e0622fef9c3036b842b5decc01cf4
Component: engine
2015-08-06 00:27:45 +08:00
acc8db8b85
Merge pull request #15305 from vdemeester/contribution-docs-updates
...
Update some contributions documentations
Upstream-commit: 6206cbe19350d8df7199573c79c981af5fc72b1d
Component: engine
2015-08-05 08:46:53 -07:00
5dd4ca1927
Windows: Fix docker/master daemon compile again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 67e670b79f1ed372b62058ebadd5821fa85cd737
Component: engine
2015-08-04 19:32:05 -07:00
aa73b79fe2
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
Upstream-commit: 7374852be9def787921aea2ca831771982badecf
Component: engine
2015-08-04 19:16:13 -07:00
9f7d6bbf8a
Merge pull request #15241 from vdemeester/api-test-coverage
...
Add more unit tests (coverage) to package api
Upstream-commit: b985dca5783f8e5bc067b9f79d8a7f53f71536e6
Component: engine
2015-08-04 18:41:35 -07:00
a1cfc26eb3
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
Upstream-commit: 2c3cd949c8db8f8bacccbd79c3f5650c8b32cabc
Component: engine
2015-08-04 18:41:02 -07:00
ff1d8010b3
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
Upstream-commit: 7b077c16d6f657309b48b05b941d3b09a705c827
Component: engine
2015-08-04 18:40:32 -07:00
57bb897892
Adding support to forked distributions in installer script.
...
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br >
Upstream-commit: f618de15436941c91cc1b82a56518a4e338c7b76
Component: engine
2015-08-04 21:33:48 -03:00
db1c12e1e7
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
Upstream-commit: 58121c59ffb3cf4795225dc1f71f3ccb1f5cf7c9
Component: engine
2015-08-04 14:16:20 -07:00
47e71fa895
Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
...
Windows: Daemon compile was broken
Upstream-commit: 63940145a465ff76b856648b570a367e5c614a54
Component: engine
2015-08-04 16:48:11 -04:00
40a95ce695
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: efd47654dd923577b6694f8ef3dddb3ac3b51816
Component: engine
2015-08-04 13:16:57 -07:00
5f1a727f3d
Merge pull request #15301 from jfrazelle/fix-systemd-docs
...
update systemd article to reference dropin file
Upstream-commit: d4d3504122211812401456e69cf4852365977a32
Component: engine
2015-08-04 22:12:36 +02:00
bc9b99ad99
Update some contributions documentations
...
- Add a golint entry to coding-style.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b30492002172a525513a2c411ebae22149dd4476
Component: engine
2015-08-04 22:04:11 +02:00
e94fbdc264
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: fe8cfc5b39ffca9f15bc5f005164aa31754ee991
Component: engine
2015-08-04 12:42:41 -07:00
f031716448
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
Upstream-commit: 23dab01ed245c5a5132a2deb7ea26c0a984ec198
Component: engine
2015-08-04 20:57:39 +02:00
cc6eee4f4a
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: e27c904b99e49e82f8d527e78161118d2b800523
Component: engine
2015-08-04 18:30:55 +00:00
5df863af84
update systemd article to reference dropin file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 35e7a7c3e2f0e7329ef666b0e5078b39626befd2
Component: engine
2015-08-04 11:03:43 -07:00
4b1fbc6af4
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f7e43d45b396d6c1f7d8f3f0606917501f466015
Component: engine
2015-08-04 19:51:02 +02:00
