toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,175 Commits 3 Branches 295 Tags
5932f8db1811446f8d5a2d7ab1cdfb1b8c136a8b
Commit Graph
30175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen J Day 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
Stephen J Day 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
Alexander Morozov 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
Doug Davis 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
Tibor Vass 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
Tonis Tiigi 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
Akihiro Suda 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
Vincent Demeester 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
Sebastiaan van Stijn 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
wefine 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
Sebastiaan van Stijn 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
Harald Albers 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
yuexiao-wang 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
Akihiro Suda 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
Brian Goff 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
lixiaobing10051267 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
Brian Goff 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
Sebastiaan van Stijn 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
Aaron Lehmann 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
Aaron Lehmann 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
Victor Vieux 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
Aaron Lehmann 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
Tonis Tiigi 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
Tibor Vass 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
Josh Eveleth 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
Akihiro Suda 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
lixiaobing10051267 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
Akihiro Suda 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
Yunxiang Huang 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
John Howard 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
John Howard 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
Tibor Vass 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
Tonis Tiigi 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
Madhu Venugopal 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
John Howard 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
Victor Vieux a767e74156 Merge pull request #29889 from vieux/small_secret_doc_update 
small secret doc update
Upstream-commit: bcf70b309b533269e35ce7b6f2c34c892f5b684d
Component: engine
 2017-01-04 11:27:11 -08:00
Sebastiaan van Stijn 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
Harald Albers 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
John Howard 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
Vincent Demeester 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
Sebastiaan van Stijn 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
yuexiao-wang 47aebadce2 keep network option consistent between network connect and run 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4f9b076e8eecb19083b3875b7cacbc3b660fde75
Component: engine
 2017-01-04 19:54:03 +08:00
Vincent Demeester 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
Vincent Demeester 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