3bc19fbcc4
Merge pull request #29795 from vdemeester/integration-request-package
...
[test-integration] Add a new request package in integration-cli
Upstream-commit: d4791c7b64b6095917e0a0ac9b376045ef3d353f
Component: engine
2017-01-09 14:51:40 +01:00
a4186cae43
Merge pull request #29874 from allencloud/fix-29872-volume-ls-filter
...
fix volume ls filter driver
Upstream-commit: e8e4546bc34ae3b84a9cbdd089f972f56695ece5
Component: engine
2017-01-09 13:06:17 +01:00
7d491b0c56
Merge pull request #29989 from yuexiao-wang/fix-url-alias
...
Fix incorrect alias and URL
Upstream-commit: 03d28f75b878e277073a4db235af3381d3697eec
Component: engine
2017-01-09 11:59:56 +01:00
afa2fae81f
Fix incorrect alias and URL
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9c0b3e1650ffe6f85376e1399a304204539d2495
Component: engine
2017-01-09 20:14:48 +08:00
464b599165
Merge pull request #29985 from lixiaobing10051267/masterEvnfile
...
fix some typos in runconfig\opts\envfile_test.go
Upstream-commit: 141e1b3eb6425057b5b302b9002590e104b7f660
Component: engine
2017-01-09 11:43:31 +01:00
a1623b99ae
Merge pull request #29931 from tonistiigi/test-swarm-errors
...
Add test for swarm error handling
Upstream-commit: f96180a0a88c541b1a413a9371cb5695c70b7323
Component: engine
2017-01-09 11:26:09 +01:00
cd5b952e17
fix some typos in runconfig\opts\envfile_test.go
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 58da4c1bab83988486d31ad497a68abd77f05316
Component: engine
2017-01-09 11:14:18 +08:00
bbb9a20ab0
Merge pull request #29981 from allencloud/fix-nits-in-comments
...
fix nit in comments
Upstream-commit: b532e15036132cc1dae44989e1f9f1cf01f139ff
Component: engine
2017-01-08 09:34:43 -05:00
aa92b07a0f
fix nit in comments
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 847de59934bd1f9134b235ce70a5c2e1085a470e
Component: engine
2017-01-08 21:32:30 +08:00
dcda437eae
Merge pull request #29963 from stevvooe/use-digest-package
...
*: use opencontainers/go-digest package
Upstream-commit: 7c62f58b27f98140ff3d39de166bf2e107e84a65
Component: engine
2017-01-07 09:22:50 -08:00
5932f8db18
vendor: update dependencies for go-digest
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 083ad52f607e83b41e508827c8d502448f606a09
Component: engine
2017-01-06 18:48:52 -08:00
775c5633ef
*: use opencontainers/go-digest package
...
The `digest` data type, used throughout docker for image verification
and identity, has been broken out into `opencontainers/go-digest`. This
PR updates the dependencies and moves uses over to the new type.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 7a855799175b6b984886ef1cfa337d6df1d4c668
Component: engine
2017-01-06 18:48:41 -08:00
096ec96e89
Merge pull request #29917 from rhvgoyal/output-device-id
...
devmapper: Return device id in error message
Upstream-commit: c43bac064ba634f04145ff94083137d2b24545e1
Component: engine
2017-01-06 17:36:18 -08:00
042842caf4
Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4
...
Revendor swarmkit to 2e956c4
Upstream-commit: fad6db4465d6c30f380e3d6638377ced1202116c
Component: engine
2017-01-06 17:09:21 -08:00
aa762aa524
Merge pull request #29956 from tonistiigi/fix-workdir-cache
...
Fix workdir cache invalidation
Upstream-commit: ce814b20197003aaed24136c508c381d445152cb
Component: engine
2017-01-06 19:40:53 -05:00
4cc05c4d0d
Merge pull request #29949 from albers/fix-changelog-create-service
...
Fix wrong command in changelog
Upstream-commit: 6d77c02240c43b79ed518ad9ef92466aa84b2b4a
Component: engine
2017-01-06 13:30:00 -08:00
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
f491f5cc6c
Merge pull request #29893 from cpuguy83/fix_race_in_plugin_activation
...
Fix race accessing plugin storage map
Upstream-commit: 2e3a62152373af5d7238a375785cfdf39b413919
Component: engine
2017-01-07 04:48:41 +09:00
a6a7d0048a
Merge pull request #29741 from yuexiao-wang/update-option
...
keep network options consistent between network connect and run
Upstream-commit: ee9bb347a678640a5305314eca99870971c1fc65
Component: engine
2017-01-06 19:01:48 +01: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
6e6e9806d5
Fix wrong command in changelog
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1fe0270e728dd587c724c5f0de211ab739918e4b
Component: engine
2017-01-06 07:45:09 -08: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
bd5280d393
Fix race accessing plugin storage map
...
`plugins.GetAll()` was not locking the plugin map when checking if a
plugin exists, this can cause a race and potentially a panic if another
goroutine is trying to load a plugin into the map at the same time.
Also fixes a race during activation where a plugin inserts itself into
the plugin map but does not check if something else is already there.
This is already checked before trying to activate the plugin, however
the map lock is not held for this entire period, so other plugins may be
loaded during this time.
To fix, before inserting the plugin into the map, check if one with the
same name already exists and use that instead.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 21fcbb39b73310e69d6403a1cfa8b26799cc1355
Component: engine
2017-01-05 22:40:45 -05: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
2eb5499d33
Add test for swarm error handling
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d377b074fdcbf735d9fbafdb9bcab6878e5c0ae9
Component: engine
2017-01-05 15:46:07 -08: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
5b11368767
Revendor swarmkit to 2e956c4
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: b1f5320dd6812a34cb4684419f509d17798985b7
Component: engine
2017-01-05 14:55:52 -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
a480d05277
devmapper: Return device id in error message
...
I often get complains that container removal failed and users got following
error message.
"Driver devicemapper failed to remove root filesystem 18a69ba82aaf7a039ce7d44156215012d703001643079775190ac7dd6c6acf56:Device is Busy"
This error message talks about container id but does not give any info
about which particular device id is busy. Most likely device is mounted
in some other mount namespace and if one knows the device id, they
can try to do some debugging figuring which process and which mount
namespace is keeping the device busy and how did we reach that stage.
Without that information, it becomes almost impossible to debug the
problem.
So to improve the debuggability, when device removal fails, also return
device id in error message. Now new message looks as follows.
"Driver devicemapper failed to remove root filesystem 18a69ba82aaf7a039ce7d44156215012d703001643079775190ac7dd6c6acf56: Failed to remove device dbc15bdf9994a17c613d8ef9e924f3cffbf67f91e4f709295c901ad628377991:Device is Busy"
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 39bdf601f6bea3c189d8e189e13c7e48b6f66b43
Component: engine
2017-01-05 15:02:21 -05: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
