8c0dd9d182
Merge pull request #19522 from aaronlehmann/vendor-distribution-2
...
Vendor updated distribution
2016-01-21 08:15:41 -08:00
72c425785c
Merge pull request #19534 from hqhq/hq_fix_update_swap
...
Fix comment about swap limit of docker update
2016-01-21 08:12:00 -08:00
757d686700
Merge pull request #19500 from cpuguy83/fix_loading_with_containerized_plugins
...
Fix loading with containerized plugins
2016-01-21 08:57:01 -05:00
476edba011
Merge pull request #19483 from coolljt0725/fix_19477
...
Fix #19477 , clean up the ports when release network
2016-01-21 14:29:29 +01:00
db25ba1486
Merge pull request #19536 from wenchma/fix_typo
...
Fixes the typo of docker_cli_network_unix_test.go
2016-01-21 09:42:36 +01:00
2e6b1eb309
Fixes the typo of docker_cli_network_unix_test.go
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-21 16:37:17 +08:00
5537a92e45
Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
...
Cleanup build rpm deb
2016-01-20 23:58:33 -08:00
603bc69b2c
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>
2016-01-21 13:48:53 +08:00
7db58948bf
Merge pull request #19434 from HackToday/fixmntvolume
...
Refine the volume mount example
2016-01-20 20:42:24 -08:00
13dbf52611
Merge pull request #19530 from HackToday/fixtiny
...
Fix the typo in ps
2016-01-20 20:41:35 -08:00
c2b59b03df
Fix the typo in ps
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-21 04:26:49 +00:00
7bf776f1c3
Merge pull request #19482 from LK4D4/up_osx_sdk
...
Move long compilations before Go install in Dockerfile
2016-01-20 20:11:32 -05:00
6025517b68
Fix #19477 , clean up the ports when release network
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-20 20:09:11 -05:00
bb8d8a645a
Merge pull request #19430 from keloyang/StatsNoStreamGetCpu
...
remove the check of ContentLength in TestApiStatsNoStreamGetCpu
2016-01-21 09:07:00 +08:00
a160dd4987
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>
2016-01-20 15:46:11 -08:00
ee001d87a9
Merge pull request #19514 from cpuguy83/19444_fix_links_with_same_name
...
Don't error out when link name in use.
2016-01-20 15:21:58 -08:00
4a9523adc9
Merge pull request #19513 from crosbymichael/tty-restore
...
Move tty set and restore to caller
2016-01-20 15:05:14 -08:00
ad87333f79
Merge pull request #19452 from mortonfox/patch-1
...
cgroups documentation moved
2016-01-20 14:54:24 -08:00
7915077a38
Merge pull request #19485 from HackToday/fixlink
...
Fix the ulimit link
2016-01-20 14:53:38 -08:00
048234fcdb
Merge pull request #19487 from HackToday/fixcommitcli
...
Fix commit wrong repository example
2016-01-20 14:45:59 -08:00
c21eb2a420
Merge pull request #19501 from vdemeester/remove-validate-vendor-from-default-bundles
...
Remove validate-vendor from default bundles
2016-01-20 14:29:07 -08:00
332d95fd0d
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>
2016-01-20 16:40:56 -05:00
a1eb6029cc
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>
2016-01-20 13:32:19 -08:00
7bddbdf360
Merge pull request #19503 from jfrazelle/update-logrus
...
bump logrus
2016-01-20 12:54:49 -08:00
2705fa573b
Merge pull request #19457 from calavera/post_config_verification
...
Fix post config verification without flags.
2016-01-20 14:49:32 -05:00
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
cfb2c667ad
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>
2016-01-20 13:57:52 -05:00
cd3446972e
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>
2016-01-20 13:01:07 -05:00
fd79462af3
Merge pull request #19044 from HackToday/18890-validate-volume
...
Fix volume filter validation
2016-01-20 09:56:30 -08:00
95695aa38c
bump logrus
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-01-20 09:51:09 -08:00
e5bce74592
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>
2016-01-20 18:29:28 +01: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
d85b9f8580
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>
2016-01-20 12:23:17 -05: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
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
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
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
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
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
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
5e450bc5df
fix a spelling error of 'dnsmasq'
...
Signed-off-by: Wenyu You <21551128@zju.edu.cn>
2016-01-20 06:12:22 +00:00
David Calavera
Tibor Vass
Vincent Demeester
Antonio Murdaca
Wen Cheng Ma
Jess Frazelle
Qiang Huang
Sebastiaan van Stijn
Kai Qiang Wu(Kennan)
Brian Goff
Lei Jitang
Aaron Lehmann
Alexander Morozov
Michael Crosby
Jessica Frazelle
Dave Barboza
Doug Davis
Steve Durrheimer
Alexander Morozov
Wenyu You