236f68013a
Fix workdir cache invalidation
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e16086005425b626bccc0fedcf5ae195f913c636
Component: engine
2017-01-06 12:10:59 -08:00
5c69746852
Merge pull request #29841 from wefine/docker_image_tag_input_check
...
check both source_image_tag and target_image_tag for 'docker image tag'
Upstream-commit: fc9d74136bf22f9a1d0a7d69bfeae33055d360ad
Component: engine
2017-01-06 17:58:58 +01:00
06b5f5c249
check both source_image_tag and target_image_tag for 'docker image tag'
...
Signed-off-by: wefine <wang.xiaoren@zte.com.cn >
Upstream-commit: a041697cabb934e875a1e7f8adea15495209b347
Component: engine
2017-01-07 04:55:53 +08:00
1725c8a9d3
Merge pull request #29899 from Microsoft/jjh/testbuildworkdirimagecmd
...
Windows: Enable TestBuildWorkdirImageCmd
Upstream-commit: b7c25317799e5fa380d3167823f09263f4397114
Component: engine
2017-01-06 17:15:22 +01:00
d5e0782250
Merge pull request #29934 from lixiaobing10051267/masterTop
...
Provide correct command information and URL
Upstream-commit: ec215d48603706ceaa62d5bfd16fee902168d087
Component: engine
2017-01-06 15:02:34 +01:00
2f07f645eb
Merge pull request #29935 from yuexiao-wang/fix-return
...
Remove redundant return nil
Upstream-commit: 1df474a3118907a072ff5ac7a60529f0846a770e
Component: engine
2017-01-06 13:59:44 +01:00
434810fce9
Remove redundant return nil
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9788822421255a0516a0e3ce2ac32b1ec9d7d894
Component: engine
2017-01-06 22:18:10 +08:00
72dca92b14
Merge pull request #29929 from aaronlehmann/secret-test-fix
...
Fix TestSecretCreateWithLabels nondeterminism
Upstream-commit: bf8cdb9172c3516eecb80974971b0b2da00afc11
Component: engine
2017-01-06 13:47:08 +09:00
97d6813cf8
Provide correct command imformation and URL
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d8e6241989cdfda4513dd30faef00f1f71afa489
Component: engine
2017-01-06 11:02:02 +08:00
47410763de
Merge pull request #29923 from tonistiigi/plugin-names
...
Set plugins used in tests back to original names
Upstream-commit: 9c3955aae1bf5f743523abc7d310b0a6668ee062
Component: engine
2017-01-05 21:41:39 -05:00
f61ba34e6f
Merge pull request #29924 from aaronlehmann/logrus-vendor
...
vendor: Unfork logrus dependency
Upstream-commit: 5259d7639347e50e1a63eb64570cae71cb9a37c3
Component: engine
2017-01-06 02:10:22 +01:00
0317f61145
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 >
Upstream-commit: 45833ce54d741b2378819e3ba5859533c317ae01
Component: engine
2017-01-05 15:22:51 -08:00
773b47f51e
Merge pull request #29920 from jeveleth/patch-1
...
Fixes minor typo
Upstream-commit: 1b2786c2c21d0e432b769446c02beed99550b57d
Component: engine
2017-01-05 14:37:00 -08:00
d3ac4a81ef
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 >
Upstream-commit: 11df2db538fbc7a6181c591b6ec47db9f96a87e4
Component: engine
2017-01-05 14:19:08 -08:00
beeae010cf
Set plugins used in tests back to original names
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f4798b98fc2c8d3d7688fdd7c1a055f452c29770
Component: engine
2017-01-05 13:55:43 -08:00
dc5e201344
Merge pull request #29845 from vdemeester/fix-the-fix-facepalming-myself
...
[test-integration] Should check for output, not error in deleteContainer
Upstream-commit: 40afb853d718358a26b01d6e796f80f8cf0c5728
Component: engine
2017-01-05 13:26:39 -08:00
c2674c6655
Fix minor typo
...
Signed-off-by: Josh Eveleth <joshe@opendns.com >
Upstream-commit: eee0cfa45dd75223dec204428dc85dccb2b5abe9
Component: engine
2017-01-05 12:45:56 -08:00
c2ca52e58a
Merge pull request #29908 from lixiaobing10051267/masterExpectedErr
...
optimize Fatalf with the expectedError
Upstream-commit: 766e53d8cb21642ab7ed0cd3f93f6265107ef969
Component: engine
2017-01-05 18:05:08 +09:00
122bb479a3
Merge pull request #29888 from albers/completion-plugin-names
...
Add bash completion for plugin names
Upstream-commit: 1dad4cf30c7cdccdc04d5d8c5d4ac9f8f729f0f3
Component: engine
2017-01-05 09:54:17 +01:00
092b719cd9
Merge pull request #29903 from Microsoft/jjh/volumetest-tp5
...
Windows: Fix TP5 volume unit tests TODOs
Upstream-commit: 7ad34996bc88ce13ad4d7fb9b89be57366e75bb0
Component: engine
2017-01-05 09:53:31 +01:00
d5020524c6
Merge pull request #29739 from tonistiigi/add-restart-liverestore-test
...
Add test TestRestartPolicyWithLiveRestore
Upstream-commit: ec6d322d37d5faf5e46a99dba78809913f6ab0ac
Component: engine
2017-01-05 09:39:07 +01:00
d7d442f89f
Merge pull request #29907 from YunxiangHuang/fix_zsh_docker
...
Fix completion for zsh
Upstream-commit: 6b49da6edb2f40b3618fd68e82bff66508d0c603
Component: engine
2017-01-05 09:34:39 +01:00
16eae482a2
optimize Fatalf with the expectedError
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 63058171849a9b491da2f2c45b476c0d58daa4a7
Component: engine
2017-01-05 14:47:36 +08:00
354a4c397b
Merge pull request #29892 from Microsoft/jjh/volcomment
...
Correct comment in vol driver interface
Upstream-commit: 10eee3dfa7808f8b252fa6a998fc033bd5fd0c83
Component: engine
2017-01-05 13:11:34 +09:00
de1ab35d12
Fix "zsh/_docker"
...
Signed-off-by: Yunxiang Huang <hyxqshk@vip.qq.com >
Upstream-commit: c6544394b8c5f406ea9054ed7e3e00206c2f0235
Component: engine
2017-01-05 11:13:17 +08:00
75ea28e3b8
Windows: Fix old TP5 volume unit tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: cc3e59c44e997c6c399415d1378072f247129230
Component: engine
2017-01-04 16:17:55 -08:00
55d4d2f410
Windows: Enable TestBuildWorkdirImageCmd
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 528a5fd2ba02ea8d34cc528cddbd1b5b62a30074
Component: engine
2017-01-04 15:33:40 -08:00
a89bf941cb
Merge pull request #29877 from mavenugo/npfilter
...
Use GetAllByCap to get list of network plugins in docker info
Upstream-commit: 4617b66c90eb54119d54f459f48f873f583731df
Component: engine
2017-01-04 14:57:20 -08:00
7979981cc5
Add test TestRestartPolicyWithLiveRestore
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 89f034093a771fc1d3d161d23e018c25ae4e2ee3
Component: engine
2017-01-04 14:12:49 -08:00
6ff3e9dd6b
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 >
Upstream-commit: 6aaa85f0b0dd030f68512ca9004823926419f5fd
Component: engine
2017-01-04 12:38:14 -08:00
5bd9457743
Correct comment in vol driver interface
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c2246f28f6bd8f4ebc333cfdb8a9e8ab6d1b7845
Component: engine
2017-01-04 12:06:37 -08:00
966dc7a8d7
Merge pull request #29867 from Microsoft/jjh/isolationwording
...
Docs: Tidy --isolation wording
Upstream-commit: f0a13eb620762fd6a9627de8498b2746586da8bd
Component: engine
2017-01-04 19:32:49 +01:00
65432d04b8
Add bash completion for plugin names
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e7243a303a9fb982db535b9941b9a60df0be8de5
Component: engine
2017-01-04 09:53:14 -08:00
6fad25131b
Tidy --isolation wording
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c32916141f7678e3f0a87fc4de5cb03535a816c
Component: engine
2017-01-04 09:14:10 -08:00
8965c03605
Merge pull request #29861 from Microsoft/jjh/tidywinkv
...
Tidy kernel version in tests
Upstream-commit: 03c17ab66a3d1adc2e6c3e0ac436afe43bcfd3b1
Component: engine
2017-01-04 15:48:20 +01:00
85a740c504
Merge pull request #29650 from allencloud/support-registry-mirror-config-reload
...
support registry mirror config reload
Upstream-commit: d3f30d6a67577a52162b36a1af13eb4167e48c6b
Component: engine
2017-01-04 13:46:19 +01:00
548c0ae5fe
Merge pull request #29697 from yuexiao-wang/fix-docker-daemon
...
Update docker daemon to dockerd
Upstream-commit: 6129e6ce3ebd1bd6c9db76e196248c613fda6e40
Component: engine
2017-01-04 11:55:38 +01:00
1f42780a09
Should check for output, not error in deleteContainer
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b029d3dee36d2d3c51b66557b4f03e493fe45fee
Component: engine
2017-01-04 11:15:36 +01:00
b452e40ef4
small secret doc update
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 91b739b55246a74f92e537c2c03ec94a50797184
Component: engine
2017-01-03 23:13:31 -08:00
e7cd6e9e80
support registry mirror config reload
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 5b9348c553d183bc62f6e7cc8f934766fac162bd
Component: engine
2017-01-04 11:04:00 +08:00
e5d82b6a00
Merge pull request #29431 from vieux/update_plugin_examples
...
replace no-remove by sample-volume-plugin in docs
Upstream-commit: 355f2ae972cc6b5070d14c16113bc9da076561d4
Component: engine
2017-01-03 18:05:44 -08:00
25dd6a8c20
Merge pull request #29733 from cpuguy83/fix_v1plugin_deadlock
...
Fix race/deadlock in v1 plugin handlers
Upstream-commit: 48ed4f0639d2f290603a04ec146beb3f9569280f
Component: engine
2017-01-03 17:02:15 -08:00
17d62dfc95
replace no-remove by sample-volume-plugin in docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bcead9282e17f51b01c4edfa59221546f02aaa33
Component: engine
2017-01-03 16:03:48 -08:00
ad9d96a397
Merge pull request #29862 from dnephin/strip-quotes-from-args
...
Trim quotes from tls flag values
Upstream-commit: 8e64ca31f2822eb5d11e4b14de59ed3555ef21a1
Component: engine
2017-01-03 15:21:19 -08:00
59c3c898d1
Merge pull request #29852 from thaJeztah/bump-go-units
...
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Upstream-commit: 59f6f6bc0173a0ffbaac001e07c40de18af9def4
Component: engine
2017-01-04 07:54:45 +09:00
cb7b1468a9
Merge pull request #29789 from miaoyq/optimization-error-description
...
Optimization a error description
Upstream-commit: ef9935ce8f4acf5d53db0a2f9621f9135aed442b
Component: engine
2017-01-03 13:01:22 -08:00
77a99bbc10
Trim quotes from TLS flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: abe32de6b46825300f612864e6b4c98606a5bb0e
Component: engine
2017-01-03 15:58:41 -05:00
ecc03f8a8a
Tidy kernel version in tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b06692b1a94572cd60ca066efc85107b629f30f1
Component: engine
2017-01-03 12:47:25 -08:00
4224f41161
Add quoted string flag Value.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e4c1f0772923c3069ce14a82d445cd55af3382bc
Component: engine
2017-01-03 15:09:54 -05:00
cee6d6487a
Merge pull request #29556 from mavenugo/refcount
...
Fixing a couple of network plugin life-cycle mgmt issues
Upstream-commit: 2ef6d8045415899b3faf8b68c0c732aa8c18917d
Component: engine
2017-01-03 11:13:22 -08:00
