Commit Graph

20068 Commits

Author SHA1 Message Date
4e2f8c6c8c Fix channel closing race in event tests.
Divide event matching into two functions, a matcher and
a processor. That way, the error handling doesn't call
the channel closing logic at all.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 27b060492c483d61b76f18a529c94a71fdfc5312
Component: engine
2016-01-22 13:31:46 -05: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
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
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
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
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
b1638f6733 Merge pull request #19447 from sillyousu/19407-fix-exec-store-data-race
Fix race condition in execCommandGC
Upstream-commit: bdcc3ebe4168a72a0f12d171e674905f2fb40d01
Component: engine
2016-01-20 07:46:28 -05:00
9f2615b7d3 Merge pull request #19479 from ywy1ywy/my-branch
fix a spelling error of 'dnsmasq'
Upstream-commit: 7646bed1adeb9d0b552344647fca2b619d070097
Component: engine
2016-01-20 13:33:26 +01:00
1e8b478cf3 Merge pull request #19478 from zchee/add-arg-syntax
Add `ARG` instruction syntax for vim
Upstream-commit: e9ac149472df13f1746d279263b88cb4be9eac94
Component: engine
2016-01-20 13:20:47 +01:00
30908002a5 Add zsh completion for 'docker network connect --link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fe8a6a5b679ee75587036c823890b4a39c9db031
Component: engine
2016-01-20 10:19:03 +01:00
7dd65e8f4c Add zsh completion for 'docker {network connect, create, run} --ip --ip6'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5284e037ffd301ee9ed6a23cd130f62787a93f86
Component: engine
2016-01-20 10:19:03 +01:00
faf363c01b Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 898b53fafab4859189e68d1e67780e5c4f1fdb29
Component: engine
2016-01-20 10:19:03 +01:00
ebacc2ad6e Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 32bd703926035c8c8b68be00f65d77eb752f6275
Component: engine
2016-01-20 10:14:35 +01:00
6035ebdc94 Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt
Add zsh completion for 'docker network create --ipam-opt'
Upstream-commit: d45643a8650f4c718c61fbf7ecebc8aabeb9d4d1
Component: engine
2016-01-20 00:30:30 -08:00
2bc66fc26e Merge pull request #19465 from mavenugo/sysd
Vendor libnetwork v0.6.0-rc1
Upstream-commit: 87b7ff52675119aa0ddfdfa789ad5fbf9fdd99b0
Component: engine
2016-01-20 09:02:21 +01:00
c2e0bcab00 fix a spelling error of 'dnsmasq'
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
Upstream-commit: 5e450bc5df9b59ea5b1fcee2b12b30669fb8ceff
Component: engine
2016-01-20 06:12:22 +00:00
64c61da51a Add ARG instruction syntax for vim
Signed-off-by: Koichi Shiraishi <k@zchee.io>
Upstream-commit: b15247868cf736eedb28234875508d9160a1052f
Component: engine
2016-01-20 15:08:45 +09:00
bea0f479a8 Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout
Fix DockerTrustSuite SetUpTest
Upstream-commit: cd1ed858d38af2dede529d9fade88069439fdade
Component: engine
2016-01-19 21:58:24 -08:00
818faba77e Fix race condition in execCommandGC
`daemon.execCommandGC`
The daemon object (grep execCommandGC) iterate over a map
(grep execCommands.Commands) in a goroutine.
Lock can't protect concurrency access in this case.
Exec command storage object should return a copy of commands instead.

Signed-off-by: Pei Su <sillyousu@gmail.com>
Upstream-commit: e5e62b96ce0d4eb3934a386b07203830f55e07ce
Component: engine
2016-01-20 12:52:05 +08:00
af3be96a25 Merge pull request #19466 from aaronlehmann/vendor-distribution
Vendor updated docker/distribution package
Upstream-commit: 7657e233f7dae10d8bacbd76460a1e4ca84a7ac7
Component: engine
2016-01-19 21:05:43 -05:00
dd61cb6f47 Fix DockerTrustSuite SetUpTest
This hopefully makes DockerTrustSuite.SetUpTest
less flaky.

Increased the number of attempts to check
if Notary is available before giving up.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 910a5fc2348b934dcb126c021721305d5316c7c0
Component: engine
2016-01-19 16:45:47 -08:00
7331395789 Update libcontainer to 47e3f834d73e76bc2a6a585b48d
This adds a fix for the resource struct in the cgroups type and seccomp
IsEnabled function

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5f73ab89523d240c61d8e745bc106232891b46f7
Component: engine
2016-01-19 15:34:08 -08:00
617e630788 Merge pull request #19458 from dmcgowan/layerstore-error-handling
Add more robust error handling on layer store creation
Upstream-commit: e11a7f53719cade69ef8553a71d2d6f025acde98
Component: engine
2016-01-19 14:37:23 -08:00
de82678777 Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement
Fix test requirement for ARM
Upstream-commit: 389784abe1f82a385f363acc328e2ecdbdcc6eb3
Component: engine
2016-01-19 14:24:28 -08:00
8e77159989 IT for remote network driver & ungraceful restart
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8799218d01785aa056c2f1f06f3735c3e93496b4
Component: engine
2016-01-19 14:09:11 -08:00
795bea682d Vendor libnetwork v0.6.0-rc1
- Fixes docker/docker#19404
- Fixes ungraceful daemon restart issue in systemd with remote
  network plugin (https://github.com/docker/libnetwork/issues/813)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ee3b42f385cdb41b2996b4b64f4f319adb62ad03
Component: engine
2016-01-19 13:50:17 -08:00
28d6652c84 Vendor updated docker/distribution package
Fixes #19400

Note that this introduces an incompatibility with Docker 1.10-rc1,
because the media type used for schema1 manifests has been corrected in
the upstream distribution code. Docker 1.10-rc1 won't be able to pull
old manifests from Registry 2.3-rc0 and up, but because of this vendor
update, Docker 1.10-rc2 won't have this problem.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 588e27f9a57cc2e2cdd84f49cf8cb5a7caed467b
Component: engine
2016-01-19 13:28:51 -08:00
d154b3d30f Fix test requirement for ARM
Correctly passes the DOCKER_ENGINE_GOARCH env var
to the testing environment

Also fixes logic for skipping a test if on ARM.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: d12f4babdd08acd3cf64c2ee4a9550c81d534816
Component: engine
2016-01-19 15:23:46 -05:00
d9d4f4eb39 Remove obsolete comment
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3dc8829a83d72d3a8e1d9b6a88c9e6ff9ecaf4a0
Component: engine
2016-01-19 12:17:40 -08:00
c2e2353aea Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: da26fc26b21606c085ae04ad75c1aaa7e79939f4
Component: engine
2016-01-19 21:16:16 +01:00
2c24be81fc Add more robust error handling on layer store creation
Add continue when layer fails on store creation
Trim whitespace from layerstore files to keep trailing space from failing a layer load

Fixes #19449

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: caef48f4e25eb56ae9d63aa58bea588891bed944
Component: engine
2016-01-19 11:17:08 -08:00
dca237fb71 api: client: build: do not fall through if git isn't installed
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 167cc42986c8939c7aacf73570adaf19b8cad0b3
Component: engine
2016-01-19 16:50:14 +01:00
66b0f4bcad Merge pull request #19432 from jfrazelle/fix-x32
add send, recv, and x32 so we can install i386 pkgs on amd64
Upstream-commit: 30e42a27991377e4b278dee089436bc57ee04a4d
Component: engine
2016-01-19 10:20:01 -05:00
b14ba840fe Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
Revert reporting of multiple pull errors
Upstream-commit: e8ce350669b0b8096ef2bb365ecad6fbfa966bfb
Component: engine
2016-01-19 09:51:54 -05:00
6e2509f508 Merge pull request #19426 from sanimej/restart
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
Upstream-commit: 011ca5f206ed2ffaf8a7871da4ea44c6d03cafd6
Component: engine
2016-01-19 10:28:33 +01:00
b6ea559472 Merge pull request #19437 from HackToday/fixulimit
Fix ulimit command form
Upstream-commit: 05e36d254f4310a93df7f5818e85721c3e180d91
Component: engine
2016-01-19 10:26:02 +01:00
53e905757e Merge pull request #19436 from HackToday/fixhostdev
Fix add host device example
Upstream-commit: 25f4f7151221d6a0ebb9185c03cef812ac24825d
Component: engine
2016-01-19 10:25:08 +01:00
8586a19d86 Merge pull request #19433 from HackToday/fixclidoc
Fix the privileged example
Upstream-commit: 0f04f3ba9fa81ff10424a7ef93718f8ea1dc7262
Component: engine
2016-01-19 00:37:30 -08:00
0028abf222 Fix ulimit command form
The ulimit is builtin, so we need shell form to execute it.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 98e5a8efcc390d2b5de18049e3227db7a257c232
Component: engine
2016-01-19 07:44:58 +00:00
3a7ad6768a Merge pull request #19429 from mavenugo/epv21
nil ptr check for endpointsettings when used with older clients
Upstream-commit: 6a1100cafcab1bb0775ffcd13125cbc949e3fb06
Component: engine
2016-01-19 08:43:04 +01:00
debdc9b3c1 Fix add host device example
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 62b525f75dbdb78f8ae7ee7f6b2cac2d262dc4dd
Component: engine
2016-01-19 07:00:58 +00:00
d68b8b9b1f Fix the privileged example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 3cc5550003c0b11db572f64c9fc801cde0c7447a
Component: engine
2016-01-19 06:41:49 +00:00
99e8dc11f9 Merge pull request #19431 from WeiZhang555/19422-default-network
bugfix: prevent creating network 'default'
Upstream-commit: 42ee908b3faa231322052c27d9ec8ffebc1c40eb
Component: engine
2016-01-19 14:18:20 +08:00
6541731269 add send, recv, and x32 so we can install i386 pkgs on amd64
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 308eff99e8468be4e92951de0ac69b27042a833b
Component: engine
2016-01-18 19:24:01 -08:00
187ffe612a bugfix: prevent creating network 'default'
Default is predefined network and is reserved, so we should stop user
from creating network with name `default`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 31dae442c8a640694209c7451d6e9bf644aa2743
Component: engine
2016-01-19 11:06:36 +08:00
54242d411e nil ptr check for endpointsettings when used with older clients
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 35dbce109bc1128e4abb2bd726055c2daa4842af
Component: engine
2016-01-18 17:15:59 -08:00
5779f0bfc3 Merge pull request #19420 from clnperez/close-notify-fix
Move closeNotify to fix panic with newer golang
Upstream-commit: b6be6451971afc7798c1aa22ff73d681c4e0019b
Component: engine
2016-01-18 20:08:25 -05:00
8a0c8b1a34 Revert reporting of multiple pull errors
Revert the portions of #17617 that report all errors when a pull
falls back, and go back to just reporting the last error. This was nice
to have, but causes some UX issues because nonexistent images show
additional "unauthorized" errors.

Keep the part of the PR that handled ENOSPC, as this appears to work
even without tracking multiple errors.

Fixes #19419

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 87338bf0fa97c905d2d707393c95f73aea398cad
Component: engine
2016-01-18 15:49:08 -08:00