8a2ef4bb80
Merge pull request #19574 from polonskiy/patch-2
...
fixed typo
Upstream-commit: c3a9ecedba41eef71e42bed33fc2b462b9ee1c6a
Component: engine
2016-01-22 09:14:58 +01:00
4172179211
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
Upstream-commit: b0873c2c5009d4b2f758ea49477b55a2b5600c90
Component: engine
2016-01-22 09:27:53 +02:00
2a780dbb98
Merge pull request #19562 from MHBauer/nospace-checktheoutput
...
check the output, not the errcode
Upstream-commit: 6f22d9ec4ec86bfc8f99a700fb89814a452c6cbc
Component: engine
2016-01-21 22:09:41 -05:00
7141a04b13
Merge pull request #19263 from jfrazelle/update-aa-parser
...
refactor aaparser pkg, add unit tests
Upstream-commit: 3233f4560912fee87857f653a8bb32050dc04927
Component: engine
2016-01-21 19:40:53 -05:00
5179f11960
Merge pull request #19529 from Microsoft/jjh/dockerfile
...
Windows: Update dockerfile for Windows to Windows CI
Upstream-commit: 6e16ec2b9c98bef78bd26800e8b1cfb14a6e92e2
Component: engine
2016-01-21 15:46:08 -08:00
42641a496b
check the output, not the errcode
...
- errcode of 1 can be returned for cases other than the 'no space left' case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: bcb9adf49e6726eccc1ee1ed41fbe21789c2367f
Component: engine
2016-01-21 15:23:20 -08:00
b3d838e7cb
Merge pull request #19383 from calavera/container_store
...
Extract container store from the daemon.
Upstream-commit: 9ae51b3e0f01111b743c61d8d0811e7061b490df
Component: engine
2016-01-21 17:20:47 -05:00
84f68b3062
Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
...
Carry 19305: Added `dead` to docs for docker ps -f status=...
Upstream-commit: 45db4fa70eb3d33230e38457fd98b1f5403e70d6
Component: engine
2016-01-21 13:46:51 -08:00
e6386361f9
Added dead to docs for docker ps -f status=...
...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.
Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com >
Upstream-commit: 859262a82abb482f54577935dc44c74e135dcd05
Component: engine
2016-01-21 16:44:33 -05:00
a7b9f6d573
Merge pull request #19316 from Microsoft/jjh/incontainererror
...
Windows: In container build check
Upstream-commit: e287bef453f2b4419a26e9bfa94987f13aa8376f
Component: engine
2016-01-21 13:44:19 -08:00
9b2be4c8e0
Merge pull request #19552 from aaronlehmann/vendor-distribution-3
...
Vendor updated distribution package
Upstream-commit: 3ecba7089be0fec32ab46f3bf55deb7878562b6d
Component: engine
2016-01-21 16:21:59 -05:00
fb1bb8a419
Windows: In container build check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4dbd612d474317fdd7bd983f2d1a05654c2ceaad
Component: engine
2016-01-21 13:15:23 -08:00
da964dbf58
Windows: Update dockerfile.windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: eacd2fd4daa03b1161d879e835705f7d35b871e3
Component: engine
2016-01-21 12:49:03 -08:00
3a243c7d02
Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename
...
Windows: Fix TestLinksMultipleWithSameName
Upstream-commit: 0b7e9ef910b91a0a8cb334db852ad143c4660155
Component: engine
2016-01-21 15:38:47 -05:00
91f8ed84f8
Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc
...
Don't retry downloads when disk is full
Upstream-commit: 26334b7a7d80fe233f27773bb65ac2d57d3af2a0
Component: engine
2016-01-21 15:37:50 -05:00
3dfe6e550f
Merge pull request #19524 from LK4D4/iocopy_writeto
...
Use bufio.Reader in io.Copy source for overlay.copyRegular
Upstream-commit: d2448a0c201592f93996a807a416016914efaccd
Component: engine
2016-01-21 15:37:12 -05:00
945f16abd0
Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry
...
Unwrap URL errors on retry
Upstream-commit: 16faf8f1fcc936e0776b067b26b4c01ede1af1d1
Component: engine
2016-01-21 15:36:41 -05:00
e43ee5b6f8
Vendor updated distribution package
...
Another day, another revendor.
This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.
Fixes #19526
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 921eae9d6d028187daff7521740977b07414b631
Component: engine
2016-01-21 11:01:14 -08:00
713774ce46
Merge pull request #19548 from WeiZhang555/remove-hard-coded
...
Remove hard coded 'docker' string from package
Upstream-commit: b7a68d0252d0cfcfdd33612f2267c0da926c8a4c
Component: engine
2016-01-21 13:06:22 -05:00
305118a342
Don't retry downloads when disk is full
...
There was already a check that prevented protocol-level fallback in this
situation, but retries within a specific protocol will still happen.
This makes it take a long time for the pull to finally error out.
This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to
take a long time due to the backoff between retry attempts:
PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError 5.882s
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4f13ec5551076505395ad5b1c099f47eca06e63e
Component: engine
2016-01-21 10:01:51 -08:00
34ac1eb837
Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks
...
Revert "Copy aufs hardlinks to top layer"
Upstream-commit: eacc9fc2c30be835ae31719dbc74a29c2dd26488
Component: engine
2016-01-21 09:56:26 -08:00
00230ffb92
Windows: Fix TestLinksMultipleWithSameName
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 473a32ba8f2d2d97eb0b3b745392f8b567fbaa2d
Component: engine
2016-01-21 09:52:49 -08:00
5f04a8c8b6
Merge pull request #19349 from jfrazelle/add-link-to-wiki
...
add warning if upgrading via script to migrate
Upstream-commit: 5f9375cf390b9a0ea04aba8b6bafa83a8879cb65
Component: engine
2016-01-21 12:51:25 -05:00
eb8e91aac7
Merge pull request #19541 from albers/completion-events
...
Support new events in bash completion
Upstream-commit: 7aef3112692d115ac1fdd60ec06cb501c21ef1fc
Component: engine
2016-01-21 18:40:54 +01:00
128e0a1c5a
Merge pull request #19423 from jfrazelle/apparmor-no-install
...
disable install of docker-engine for 1.10, try to get ready for 1.11
Upstream-commit: 7d19ca7c40bc2b5172854ce073a6d11175027d82
Component: engine
2016-01-21 12:08:50 -05:00
091ca20c63
Use pools.Copy instead of io.Copy for overlay.copyRegular
...
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f5e1c69b345b25d9b1c57f5d492a0e3fd4432a0
Component: engine
2016-01-21 08:53:37 -08:00
61ae1fb997
Merge pull request #19507 from aaronlehmann/certificate-error-message
...
Clarify error message when a .cert file is missing a corresponding key
Upstream-commit: aed5691644d96a8ae9522a9c8c8d325bbb14c7f3
Component: engine
2016-01-21 08:29:25 -08:00
c20140ef75
Merge pull request #19540 from A33a/A33a-patch-1
...
Fixed typo in "/etc/subUid"
Upstream-commit: 5e143d51683027e93169a66475cf28944b031daa
Component: engine
2016-01-21 17:24:29 +01:00
4787976da3
Merge pull request #19522 from aaronlehmann/vendor-distribution-2
...
Vendor updated distribution
Upstream-commit: 8c0dd9d1821fe99fa720de84a4bf96e6fb50f94b
Component: engine
2016-01-21 08:15:41 -08:00
e789dfd374
Remove hard coded 'docker' string from package
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d44e79a3661be67c49899c3a3e5c3773b8c21073
Component: engine
2016-01-22 00:14:52 +08:00
9178f1654b
Merge pull request #19534 from hqhq/hq_fix_update_swap
...
Fix comment about swap limit of docker update
Upstream-commit: 72c425785c4664a73ff1e7bf883cc06110c9bcbc
Component: engine
2016-01-21 08:12:00 -08:00
0b47135998
Revert "Copy aufs hardlinks to top layer"
...
This reverts commit ef05b83417e32f269daf798307adcf07fe6ef13f.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 98d0997894153df8f9cfc0783390cc80f6b0274a
Component: engine
2016-01-21 07:52:50 -08:00
b0c0fb2b24
Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins
...
Fix loading with containerized plugins
Upstream-commit: 757d686700b02fa79f7c59edee656b7c35f956f3
Component: engine
2016-01-21 08:57:01 -05:00
8bb1758665
Merge pull request #19483 from coolljt0725/fix_19477
...
Fix #19477 , clean up the ports when release network
Upstream-commit: 476edba01104b83f33873833e9386a98f1356383
Component: engine
2016-01-21 14:29:29 +01:00
87ce057060
Refactor handling of key specific subcompletions
...
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.
In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ab01b6f38578a97546a4d7bfaa305ef33ea96e63
Component: engine
2016-01-21 14:24:31 +01:00
b27d4760e3
Support new events in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: fcc035848f7edc395e814af559fe0be42c3552a6
Component: engine
2016-01-21 13:57:35 +01:00
3869ddcbb9
Fixed typo in "/etc/subUid"
...
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru >
Upstream-commit: 935849f17a1aceb2c453e9843322776202cb3092
Component: engine
2016-01-21 12:46:29 +01:00
d07d3c7690
Merge pull request #19536 from wenchma/fix_typo
...
Fixes the typo of docker_cli_network_unix_test.go
Upstream-commit: db25ba1486d82089e72cf9a6b47e8ac9c26693a5
Component: engine
2016-01-21 09:42:36 +01:00
8768e5ebb2
Fixes the typo of docker_cli_network_unix_test.go
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 2e6b1eb309fa98035458b993ef83736ed671b77c
Component: engine
2016-01-21 16:37:17 +08:00
bc39a3fed6
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
2016-01-20 23:58:33 -08:00
ff3e96b827
Fix comment about swap limit of docker update
...
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 603bc69b2c3c00714c18e6ddc65bf53c2f1a079d
Component: engine
2016-01-21 13:48:53 +08:00
8e2b976298
Merge pull request #19434 from HackToday/fixmntvolume
...
Refine the volume mount example
Upstream-commit: 7db58948bf256ae7daf372eed6b996688e4aae40
Component: engine
2016-01-20 20:42:24 -08:00
9a21c2f764
Merge pull request #19530 from HackToday/fixtiny
...
Fix the typo in ps
Upstream-commit: 13dbf52611899060878764427314628296316c3d
Component: engine
2016-01-20 20:41:35 -08:00
c9d0008e68
Fix the typo in ps
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: c2b59b03df364901ce51ee485d60fce7e7aaa955
Component: engine
2016-01-21 04:26:49 +00:00
0a2632d57e
Merge pull request #19482 from LK4D4/up_osx_sdk
...
Move long compilations before Go install in Dockerfile
Upstream-commit: 7bf776f1c3b114e4e7528b2ff79c74e8d286fd23
Component: engine
2016-01-20 20:11:32 -05:00
2507868b1a
Fix #19477 , clean up the ports when release network
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 6025517b68301134614985121f99ccbf3f577d42
Component: engine
2016-01-20 20:09:11 -05:00
1f1d0b2d28
Merge pull request #19430 from keloyang/StatsNoStreamGetCpu
...
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
Upstream-commit: bb8d8a645a45b5694b5f450535dc8364213fab88
Component: engine
2016-01-21 09:07:00 +08:00
41247c2b40
Vendor updated distribution
...
The only changes are https://github.com/docker/distribution/pull/1379
and https://github.com/docker/distribution/pull/1380 .
Fixes #19476
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: a160dd4987e2508bb93f37741ab82f0e724d3ed7
Component: engine
2016-01-20 15:46:11 -08:00
91470191b7
Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name
...
Don't error out when link name in use.
Upstream-commit: ee001d87a93a7da106fc052172cc3959ee457939
Component: engine
2016-01-20 15:21:58 -08:00
077cda22f8
Merge pull request #19513 from crosbymichael/tty-restore
...
Move tty set and restore to caller
Upstream-commit: 4a9523adc90de8fea1de23b5e33ae184bdd9f25e
Component: engine
2016-01-20 15:05:14 -08:00
