bcf155bb7a
Merge pull request #19469 from crosbymichael/libcontainer-resource-hf
...
Update libcontainer to 47e3f834d73e76bc2a6a585b48d
2016-01-20 11:31:14 -08:00
a866e7e2ee
Merge pull request #19496 from dbarboza/19495-doc-grammar
...
Fix minor doc grammar issues
2016-01-20 20:26:15 +01:00
fd79462af3
Merge pull request #19044 from HackToday/18890-validate-volume
...
Fix volume filter validation
2016-01-20 09:56:30 -08:00
b433e1e7fb
Merge pull request #19486 from sdurrheimer/zsh-completion-network-links
...
Zsh completion for '--alias --net-alias --ip --ip6 --link'
2016-01-20 09:28:04 -08:00
f50d0d7fdb
Fix minor doc grammar issues
...
Signed-off-by: Dave Barboza <dxbarboza@gmail.com>
2016-01-20 10:52:21 -05:00
bdcc3ebe41
Merge pull request #19447 from sillyousu/19407-fix-exec-store-data-race
...
Fix race condition in execCommandGC
2016-01-20 07:46:28 -05:00
7646bed1ad
Merge pull request #19479 from ywy1ywy/my-branch
...
fix a spelling error of 'dnsmasq'
2016-01-20 13:33:26 +01:00
e9ac149472
Merge pull request #19478 from zchee/add-arg-syntax
...
Add `ARG` instruction syntax for vim
2016-01-20 13:20:47 +01:00
2ba549407a
Merge pull request #19467 from sdurrheimer/zsh-completion-detach-keys
...
Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
2016-01-20 11:54:13 +01:00
fe8a6a5b67
Add zsh completion for 'docker network connect --link'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
5284e037ff
Add zsh completion for 'docker {network connect, create, run} --ip --ip6'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
898b53fafa
Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:19:03 +01:00
32bd703926
Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-20 10:14:35 +01:00
d45643a865
Merge pull request #19459 from sdurrheimer/zsh-completion-network-create-ipam-opt
...
Add zsh completion for 'docker network create --ipam-opt'
2016-01-20 00:30:30 -08:00
87b7ff5267
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
5e450bc5df
fix a spelling error of 'dnsmasq'
...
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
2016-01-20 06:12:22 +00:00
b15247868c
Add `ARG` instruction syntax for vim
...
Signed-off-by: Koichi Shiraishi <k@zchee.io>
2016-01-20 15:08:45 +09:00
cd1ed858d3
Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout
...
Fix DockerTrustSuite SetUpTest
2016-01-19 21:58:24 -08:00
e5e62b96ce
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>
2016-01-20 12:52:05 +08:00
7657e233f7
Merge pull request #19466 from aaronlehmann/vendor-distribution
...
Vendor updated docker/distribution package
2016-01-19 21:05:43 -05:00
910a5fc234
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>
2016-01-19 16:45:47 -08:00
5f73ab8952
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>
2016-01-19 15:34:08 -08:00
e11a7f5371
Merge pull request #19458 from dmcgowan/layerstore-error-handling
...
Add more robust error handling on layer store creation
2016-01-19 14:37:23 -08:00
389784abe1
Merge pull request #19462 from tophj-ibm/fix-arm-integration-cli-requirement
...
Fix test requirement for ARM
2016-01-19 14:24:28 -08:00
8799218d01
IT for remote network driver & ungraceful restart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-19 14:09:11 -08:00
ee3b42f385
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>
2016-01-19 13:50:17 -08:00
588e27f9a5
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>
2016-01-19 13:28:51 -08:00
c18b4943ea
Merge pull request #19460 from LK4D4/remove_comment
...
Remove obsolete comment
2016-01-19 15:29:46 -05:00
d12f4babdd
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>
2016-01-19 15:23:46 -05:00
3dc8829a83
Remove obsolete comment
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-19 12:17:40 -08:00
da26fc26b2
Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-01-19 21:16:16 +01:00
4b63689679
Merge pull request #19385 from runcom/better-git-error
...
api: client: build: do not fall through if git isn't installed
2016-01-19 11:39:05 -08:00
caef48f4e2
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)
2016-01-19 11:17:08 -08:00
167cc42986
api: client: build: do not fall through if git isn't installed
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-19 16:50:14 +01:00
30e42a2799
Merge pull request #19432 from jfrazelle/fix-x32
...
add send, recv, and x32 so we can install i386 pkgs on amd64
2016-01-19 10:20:01 -05:00
e8ce350669
Merge pull request #19424 from aaronlehmann/revert-multiple-pull-errors
...
Revert reporting of multiple pull errors
2016-01-19 09:51:54 -05:00
011ca5f206
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
2016-01-19 10:28:33 +01:00
05e36d254f
Merge pull request #19437 from HackToday/fixulimit
...
Fix ulimit command form
2016-01-19 10:26:02 +01:00
25f4f71512
Merge pull request #19436 from HackToday/fixhostdev
...
Fix add host device example
2016-01-19 10:25:08 +01:00
0f04f3ba9f
Merge pull request #19433 from HackToday/fixclidoc
...
Fix the privileged example
2016-01-19 00:37:30 -08:00
98e5a8efcc
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>
2016-01-19 07:44:58 +00:00
6a1100cafc
Merge pull request #19429 from mavenugo/epv21
...
nil ptr check for endpointsettings when used with older clients
2016-01-19 08:43:04 +01:00
62b525f75d
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>
2016-01-19 07:00:58 +00:00
3cc5550003
Fix the privileged example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-19 06:41:49 +00:00
42ee908b3f
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
308eff99e8
add send, recv, and x32 so we can install i386 pkgs on amd64
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-18 19:24:01 -08:00
31dae442c8
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>
2016-01-19 11:06:36 +08:00
35dbce109b
nil ptr check for endpointsettings when used with older clients
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-18 17:15:59 -08:00
b6be645197
Merge pull request #19420 from clnperez/close-notify-fix
...
Move closeNotify to fix panic with newer golang
2016-01-18 20:08:25 -05:00
87338bf0fa
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>
2016-01-18 15:49:08 -08:00
David Calavera
Vincent Demeester
Sebastiaan van Stijn
Dave Barboza
Doug Davis
Antonio Murdaca
Steve Durrheimer
Wenyu You
Koichi Shiraishi
Pei Su
Tibor Vass
Sebastiaan van Stijn
Michael Crosby
Jess Frazelle
Madhu Venugopal
Aaron Lehmann
Christopher Jones
Alexander Morozov
Derek McGowan
Antonio Murdaca
Kai Qiang Wu(Kennan)
Lei Jitang
Jessica Frazelle
Zhang Wei
Brian Goff