Commit Graph

21516 Commits

Author SHA1 Message Date
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
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
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
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
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
496ec096f7 Merge pull request #19452 from mortonfox/patch-1
cgroups documentation moved
Upstream-commit: ad87333f7968fe8c219288ac8bcb2e0f61c618cb
Component: engine
2016-01-20 14:54:24 -08:00
4b5b18fd7e Merge pull request #19485 from HackToday/fixlink
Fix the ulimit link
Upstream-commit: 7915077a38e30496391a0759f08134b8942f8524
Component: engine
2016-01-20 14:53:38 -08:00
f4fc2afe32 Merge pull request #19487 from HackToday/fixcommitcli
Fix commit wrong repository example
Upstream-commit: 048234fcdbc4f3af7e81048bbd2367940f3718ac
Component: engine
2016-01-20 14:45:59 -08:00
569d5959b2 Unwrap URL errors on retry
When authorization errors are returned by the token process the error will be wrapped in url.Error.
In order to check the underlying error for retry this error message should be unwrapped.
Unwrapping this error allows failure to push due to an unauthorized response to keep from retrying, possibly resulting in later 429 responses.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: e9d5292b0c4a26ed51a66437b8ab0dba03f65b8f
Component: engine
2016-01-20 14:29:38 -08:00
52842fc3ba Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles
Remove validate-vendor from default bundles
Upstream-commit: c21eb2a4209f6339fe59e4a97c3e6479aeb39f94
Component: engine
2016-01-20 14:29:07 -08:00
677299f50c Don't error out when link name in use.
This preserves old behavior from sqlite links/names.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 332d95fd0dd08c352f96e8755414e40007f6bda2
Component: engine
2016-01-20 16:40:56 -05:00
31eb5171fa Move tty set and restore to caller
Fixes #19506

This fixes the issue of errors on create and the tty not being able to
be restored to its previous state because of a race where it was
in the hijack goroutine.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: a1eb6029cc4e4ccd820b0aac147a6121f1967ba2
Component: engine
2016-01-20 13:32:19 -08:00
88d33e25a1 Merge pull request #19503 from jfrazelle/update-logrus
bump logrus
Upstream-commit: 7bddbdf360f50fed07cd21b21270f5f287222d8c
Component: engine
2016-01-20 12:54:49 -08:00
f35e915163 Merge pull request #19457 from calavera/post_config_verification
Fix post config verification without flags.
Upstream-commit: 2705fa573b10890b39295781b41dca6d69013e6b
Component: engine
2016-01-20 14:49:32 -05:00
57194af7f0 Clarify error message when a .cert file is missing a corresponding key
The daemon uses two similar filename extensions to identify different
kinds of certificates. ".crt" files are interpreted as CA certificates,
and ".cert" files are interprted as client certificates. If a CA
certificate is accidentally given the extension ".cert", it will lead to
the following error message:

    Missing key ca.key for certificate ca.cert

To make this slightly less confusing, clarify the error message with a
note that CA certificates should use the extension ".crt".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d5e2802eae4815b06ce477d8de54fe0caa3aa812
Component: engine
2016-01-20 11:34:59 -08:00
aaa9f64061 Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
Upstream-commit: bcf155bb7a3cacf8f37e98d41c136eeba3f7775e
Component: engine
2016-01-20 11:31:14 -08:00
22bda58d7b Merge pull request #19496 from dbarboza/19495-doc-grammar
Fix minor doc grammar issues
Upstream-commit: a866e7e2ee39b3008c24ae1a709afa13b17de6b8
Component: engine
2016-01-20 20:26:15 +01:00
edde0f73ca Use fine-grained locks for plugin loading.
This helps ensure that only one thing is trying to intialize a plugin at
once while also keeping the global lock free during initialization.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: cfb2c667ad0bb17d9a1bd49a294d5c38e4cbf040
Component: engine
2016-01-20 13:57:52 -05:00
55307d5648 Fix post config verification without flags.
- Set the daemon log level to what's set in the configuration.
- Enable TLS when TLSVerify is enabled.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: cd3446972e968639684f2b65bfc11c099a25f1b0
Component: engine
2016-01-20 13:01:07 -05:00
0a1bfb4731 Merge pull request #19044 from HackToday/18890-validate-volume
Fix volume filter validation
Upstream-commit: fd79462af3ebd5988a948f150bfbdcd2b04ca418
Component: engine
2016-01-20 09:56:30 -08:00
d7e4961a40 bump logrus
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 95695aa38caafa6f4cf42f90c2e0fa67c5e36b91
Component: engine
2016-01-20 09:51:09 -08:00
c61a40877b Remove validate-vendor from default bundles
Because it's triggered another way :)
See https://github.com/docker/leeroy/pull/44

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e5bce745925384501422ed61cb69b968187bda0e
Component: engine
2016-01-20 18:29:28 +01:00
ae923d4789 Merge pull request #19486 from sdurrheimer/zsh-completion-network-links
Zsh completion for '--alias --net-alias --ip --ip6 --link'
Upstream-commit: b433e1e7fb84608147825e5669146fd58dbbd07b
Component: engine
2016-01-20 09:28:04 -08:00
7568d41513 Fix loading of containerized plugins
During daemon startup, all containers are registered before any are
started.
During container registration it was calling out to initialize volumes.
If the volume uses a plugin that is running in a container, this will
cause the restart of that container to fail since the plugin is not yet
running.
This also slowed down daemon startup since volume initialization was
happening sequentially, which can be slow (and is flat out slow since
initialization would fail but take 8 seconds for each volume to do it).

This fix holds off on volume initialization until after containers are
restarted and does the initialization in parallel.

The containers that are restarted will have thier volumes initialized
because they are being started. If any of these containers are using a
plugin they will just keep retrying to reach the plugin (up to the
timeout, which is 8seconds) until the container with the plugin is up
and running.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d85b9f858050dbfb2dde3d68517952958b8e38ee
Component: engine
2016-01-20 12:23:17 -05:00
d3c651df14 Fix minor doc grammar issues
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
Upstream-commit: f50d0d7fdb11ce36715adfbf857e4668c0fd8f75
Component: engine
2016-01-20 10:52:21 -05:00