0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
30157 commits 14 branches 412 tags 338 MiB
Commit graph

30157 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
1df474a311 Merge pull request #29935 from yuexiao-wang/fix-return 
Remove redundant return nil
 2017-01-06 13:59:44 +01:00
yuexiao-wang
9788822421 Remove redundant return nil 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2017-01-06 22:18:10 +08:00
Akihiro Suda
bf8cdb9172 Merge pull request #29929 from aaronlehmann/secret-test-fix 
Fix TestSecretCreateWithLabels nondeterminism
 2017-01-06 13:47:08 +09:00
Brian Goff
9c3955aae1 Merge pull request #29923 from tonistiigi/plugin-names 
Set plugins used in tests back to original names
 2017-01-05 21:41:39 -05:00
Sebastiaan van Stijn
5259d76393 Merge pull request #29924 from aaronlehmann/logrus-vendor 
vendor: Unfork logrus dependency
 2017-01-06 02:10:22 +01:00
Aaron Lehmann
45833ce54d Fix TestSecretCreateWithLabels nondeterminism 
This test checks for the substring "foo" in the "secret ls" output. This
is a valid base36 substring and can sometimes show up by chance:

    docker_cli_secret_create_test.go:86:
        c.Assert(out, checker.Not(checker.Contains), name)
    ... obtained string = "" +
    ...     "ID                          NAME                        CREATED UPDATED\n" +
    ...     "ob8y4t4feuz8pn5h6vla9oxoz   stefoo7e268ozqfupi9s4se9q   Less than a second ago   Less than a second ago\n"
    ... substring string = "foo"

Change the secret name to test_secret, matching other tests. Underscores
can't appear in base36 so this name is safe to grep for.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 15:22:51 -08:00
Victor Vieux
1b2786c2c2 Merge pull request #29920 from jeveleth/patch-1 
Fixes minor typo
 2017-01-05 14:37:00 -08:00
Aaron Lehmann
11df2db538 vendor: Unfork logrus dependency 
Vendor the latest official logrus release instead of a custom fork
(which now happens to be identical to the fork).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 14:19:08 -08:00
Tonis Tiigi
f4798b98fc Set plugins used in tests back to original names 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-05 13:55:43 -08:00
Tibor Vass
40afb853d7 Merge pull request #29845 from vdemeester/fix-the-fix-facepalming-myself 
[test-integration] Should check for output, not error in deleteContainer
 2017-01-05 13:26:39 -08:00
Josh Eveleth
eee0cfa45d Fix minor typo 
Signed-off-by: Josh Eveleth <joshe@opendns.com>
 2017-01-05 12:45:56 -08:00
Akihiro Suda
766e53d8cb Merge pull request #29908 from lixiaobing10051267/masterExpectedErr 
optimize Fatalf with the expectedError
 2017-01-05 18:05:08 +09:00
Vincent Demeester
1dad4cf30c Merge pull request #29888 from albers/completion-plugin-names 
Add bash completion for plugin names
 2017-01-05 09:54:17 +01:00
Vincent Demeester
7ad34996bc Merge pull request #29903 from Microsoft/jjh/volumetest-tp5 
Windows: Fix TP5 volume unit tests TODOs
 2017-01-05 09:53:31 +01:00
Vincent Demeester
ec6d322d37 Merge pull request #29739 from tonistiigi/add-restart-liverestore-test 
Add test TestRestartPolicyWithLiveRestore
 2017-01-05 09:39:07 +01:00
Vincent Demeester
6b49da6edb Merge pull request #29907 from YunxiangHuang/fix_zsh_docker 
Fix completion for zsh
 2017-01-05 09:34:39 +01:00
lixiaobing10051267
6305817184 optimize Fatalf with the expectedError 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2017-01-05 14:47:36 +08:00
Akihiro Suda
10eee3dfa7 Merge pull request #29892 from Microsoft/jjh/volcomment 
Correct comment in vol driver interface
 2017-01-05 13:11:34 +09:00
Yunxiang Huang
c6544394b8 Fix "zsh/_docker" 
Signed-off-by: Yunxiang Huang <hyxqshk@vip.qq.com>
 2017-01-05 11:13:17 +08:00
John Howard
cc3e59c44e Windows: Fix old TP5 volume unit tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-01-04 16:17:55 -08:00
Tibor Vass
4617b66c90 Merge pull request #29877 from mavenugo/npfilter 
Use GetAllByCap to get list of network plugins in docker info
 2017-01-04 14:57:20 -08:00
Tonis Tiigi
89f034093a Add test TestRestartPolicyWithLiveRestore 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-04 14:12:49 -08:00
Madhu Venugopal
6aaa85f0b0 Swarmkit has enabled the plugin filtering logic based on the drivers 
returned in "docker info". Currently info endpoint isnt using the
GetAllByCap, but relies on existing networks to get the plugin names.
This causes a basic issue when it comes to global network plugins which
swarm-mode relies on, wherein swarmkit will not be able to schedule the
network on the worker nodes due to the filtering logic.

In order to break this chicken & egg issue, we must start to use the
GetAllManagedPluginsByCap. We are unable to use GetAllByCap due to
various issues with Plugin-V1's lazy loading approach causing issues
especially during daemon restarts (which uses SystemInfo)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-01-04 12:38:14 -08:00
John Howard
c2246f28f6 Correct comment in vol driver interface 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-01-04 12:06:37 -08:00
Victor Vieux
bcf70b309b Merge pull request #29889 from vieux/small_secret_doc_update 
small secret doc update
 2017-01-04 11:27:11 -08:00
Sebastiaan van Stijn
f0a13eb620 Merge pull request #29867 from Microsoft/jjh/isolationwording 
Docs: Tidy --isolation wording
 2017-01-04 19:32:49 +01:00
Harald Albers
e7243a303a Add bash completion for plugin names 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-01-04 09:53:14 -08:00
John Howard
3c32916141 Tidy --isolation wording 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-01-04 09:14:10 -08:00
Vincent Demeester
03c17ab66a Merge pull request #29861 from Microsoft/jjh/tidywinkv 
Tidy kernel version in tests
 2017-01-04 15:48:20 +01:00
Sebastiaan van Stijn
d3f30d6a67 Merge pull request #29650 from allencloud/support-registry-mirror-config-reload 
support registry mirror config reload
 2017-01-04 13:46:19 +01:00
Vincent Demeester
6129e6ce3e Merge pull request #29697 from yuexiao-wang/fix-docker-daemon 
Update docker daemon to dockerd
 2017-01-04 11:55:38 +01:00
Vincent Demeester
b029d3dee3
Should check for output, not error in deleteContainer 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-01-04 11:15:36 +01:00
Victor Vieux
91b739b552 small secret doc update 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-03 23:13:31 -08:00
allencloud
5b9348c553 support registry mirror config reload 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-01-04 11:04:00 +08:00
Victor Vieux
355f2ae972 Merge pull request #29431 from vieux/update_plugin_examples 
replace no-remove by sample-volume-plugin in docs
 2017-01-03 18:05:44 -08:00
Tibor Vass
48ed4f0639 Merge pull request #29733 from cpuguy83/fix_v1plugin_deadlock 
Fix race/deadlock in v1 plugin handlers
 2017-01-03 17:02:15 -08:00
Victor Vieux
bcead9282e replace no-remove by sample-volume-plugin in docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-03 16:03:48 -08:00
Victor Vieux
8e64ca31f2 Merge pull request #29862 from dnephin/strip-quotes-from-args 
Trim quotes from tls flag values
 2017-01-03 15:21:19 -08:00
Akihiro Suda
59f6f6bc01 Merge pull request #29852 from thaJeztah/bump-go-units 
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
 2017-01-04 07:54:45 +09:00
Tibor Vass
ef9935ce8f Merge pull request #29789 from miaoyq/optimization-error-description 
Optimization a error description
 2017-01-03 13:01:22 -08:00
Daniel Nephin
abe32de6b4 Trim quotes from TLS flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 15:58:41 -05:00
John Howard
b06692b1a9 Tidy kernel version in tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-01-03 12:47:25 -08:00
Daniel Nephin
e4c1f07729 Add quoted string flag Value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-03 15:09:54 -05:00
Victor Vieux
2ef6d80454 Merge pull request #29556 from mavenugo/refcount 
Fixing a couple of network plugin life-cycle mgmt issues
 2017-01-03 11:13:22 -08:00
Vincent Demeester
d1ef47b410 Merge pull request #29843 from YuPengZTE/devVet 
fix syscall.GUID composite literal uses unkeyed fields
 2017-01-03 19:12:32 +01:00
Sebastiaan van Stijn
0e16b5cb3a
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-01-03 18:43:25 +01:00
Sebastiaan van Stijn
e4223e3361 Merge pull request #26830 from dnephin/man-desc-in-files 
Move the command description to a markdown file for man pages
 2017-01-03 17:47:49 +01:00
Sebastiaan van Stijn
d6e5032410 Merge pull request #29847 from albers/completion-service-ps-multiple 
Support multiple services on bash completion for `docker service ps`
 2017-01-03 17:13:07 +01:00
Vincent Demeester
074f6bbe89 Merge pull request #29776 from allencloud/better-plugin-in-docs 
update plugins in docs and correct things in index.md
 2017-01-03 17:01:56 +01:00
allencloud
6d3e1d2fd2 update plugins in docs and correct things in index.md 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-01-03 22:34:32 +08:00