Vincent Demeester
7646bed1ad
Merge pull request #19479 from ywy1ywy/my-branch
...
fix a spelling error of 'dnsmasq'
2016-01-20 13:33:26 +01:00
Antonio Murdaca
e9ac149472
Merge pull request #19478 from zchee/add-arg-syntax
...
Add `ARG` instruction syntax for vim
2016-01-20 13:20:47 +01:00
Vincent Demeester
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
Kai Qiang Wu(Kennan)
3c8042a0cb
Fix commit wrong repository example
...
The old name is invalid in new repository name spec.
So we need to fix them.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-20 10:25:41 +00:00
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Kai Qiang Wu(Kennan)
8f3c0fdff3
Fix the ulimit link
...
The old link not existed, we need fix it the right one.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-20 09:18:20 +00:00
Steve Durrheimer
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
Sebastiaan van Stijn
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
Vincent Demeester
87b7ff5267
Merge pull request #19465 from mavenugo/sysd
...
Vendor libnetwork v0.6.0-rc1
2016-01-20 09:02:21 +01:00
Alexander Morozov
c38cba3b8c
Move long compilations before Go install in Dockerfile
...
Now we can avoid long compilations on Go update.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-19 22:43:42 -08:00
Kai Qiang Wu(Kennan)
9e3c1f2609
Refine the volume mount example
...
The path here should be absolute, else it would
deem it as volume name.
Also link to release page to contain static binary,
the old link not work, because it is just used to
install docker in os distro, it can not be used
as static binary directly.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-20 06:40:46 +00:00
Wenyu You
5e450bc5df
fix a spelling error of 'dnsmasq'
...
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
2016-01-20 06:12:22 +00:00
Koichi Shiraishi
b15247868c
Add `ARG` instruction syntax for vim
...
Signed-off-by: Koichi Shiraishi <k@zchee.io>
2016-01-20 15:08:45 +09:00
Sebastiaan van Stijn
cd1ed858d3
Merge pull request #19471 from thaJeztah/fix-19393-increase-timeout
...
Fix DockerTrustSuite SetUpTest
2016-01-19 21:58:24 -08:00
Pei Su
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
Tibor Vass
7657e233f7
Merge pull request #19466 from aaronlehmann/vendor-distribution
...
Vendor updated docker/distribution package
2016-01-19 21:05:43 -05:00
Jessica Frazelle
0bff2515f7
add a way to only build requested pkgs
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-19 17:47:27 -08:00
Sebastiaan van Stijn
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
John Howard
33729d3b5a
Windows: VirtualTerminalInput native console
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-19 15:59:21 -08:00
Jessica Frazelle
60d44d8b80
add warning if upgrading via script to migrate
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-19 15:41:08 -08:00
Michael Crosby
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
Sebastiaan van Stijn
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
Jess Frazelle
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
Madhu Venugopal
8799218d01
IT for remote network driver & ungraceful restart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-19 14:09:11 -08:00
Madhu Venugopal
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
Aaron Lehmann
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
Doug Davis
c18b4943ea
Merge pull request #19460 from LK4D4/remove_comment
...
Remove obsolete comment
2016-01-19 15:29:46 -05:00
Christopher Jones
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
Alexander Morozov
3dc8829a83
Remove obsolete comment
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-19 12:17:40 -08:00
Steve Durrheimer
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
Sebastiaan van Stijn
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
Derek McGowan
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
David Calavera
3c82fad441
Extract container store from the daemon.
...
- Generalize in an interface.
- Stop abusing of List for everything.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-19 13:21:41 -05:00
Morton Fox
596836e0e4
cgroups documentation moved
...
Signed-off-by: Morton Fox <github@qslw.com>
2016-01-19 11:26:58 -05:00
Antonio Murdaca
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
Tibor Vass
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
Tibor Vass
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
Vincent Demeester
011ca5f206
Merge pull request #19426 from sanimej/restart
...
Vendoring miekg/dns @ 75e6e86cc601825c5dbcd4e0c209eab180997cd7
2016-01-19 10:28:33 +01:00
Vincent Demeester
05e36d254f
Merge pull request #19437 from HackToday/fixulimit
...
Fix ulimit command form
2016-01-19 10:26:02 +01:00
Vincent Demeester
25f4f71512
Merge pull request #19436 from HackToday/fixhostdev
...
Fix add host device example
2016-01-19 10:25:08 +01:00
Sebastiaan van Stijn
0f04f3ba9f
Merge pull request #19433 from HackToday/fixclidoc
...
Fix the privileged example
2016-01-19 00:37:30 -08:00
Kai Qiang Wu(Kennan)
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
Antonio Murdaca
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
Kai Qiang Wu(Kennan)
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
Kai Qiang Wu(Kennan)
3cc5550003
Fix the privileged example
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-19 06:41:49 +00:00
Lei Jitang
42ee908b3f
Merge pull request #19431 from WeiZhang555/19422-default-network
...
bugfix: prevent creating network 'default'
2016-01-19 14:18:20 +08:00
yangshukui
d474f7fb86
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
...
Signed-off-by: yangshukui <yangshukui@huawei.com>
2016-01-19 12:06:01 +08:00
Jessica Frazelle
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