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

29414 commits

This branch
This branch
All branches
Author SHA1 Message Date
Darren Stahl
dee2968560 Stop retrying pull on UnkownBlob error 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-29 15:06:25 -08:00
Madhu Venugopal
4fae94f663 Merge pull request #28721 from dongluochen/attachable_network 
Fix network attachable option
 2016-11-29 11:04:49 -08:00
Sebastiaan van Stijn
7debf456e3 Merge pull request #28778 from Microsoft/jjh/volumenote 
Windows: Note about volumes in run
 2016-11-29 17:40:54 +01:00
Anusha Ragunathan
82b35dd997 Merge pull request #28717 from yongtang/28684-duplicate-docker-plugin-create 
Fix issue caused by duplicate `docker plugin create` with same names
 2016-11-29 08:22:40 -08:00
Sebastiaan van Stijn
492bc8eb45 Merge pull request #28905 from jlhawn/reject_unspecified_advertise_addr 
Reject unspecified advertise addr on swarm init
 2016-11-29 16:24:45 +01:00
Vincent Demeester
9387ccc683 Merge pull request #28928 from miaoyq/fix-some-format-err 
Fix some format errors
 2016-11-29 16:02:35 +01:00
Sebastiaan van Stijn
209c6a419a Merge pull request #28935 from likel/improve-style 
Initialize field with name
 2016-11-29 15:52:13 +01:00
Sebastiaan van Stijn
82506fe9a9 Merge pull request #28914 from aaronlehmann/cluster-object 
cluster: Refuse swarm spec not named "default"
 2016-11-29 15:41:05 +01:00
Vincent Demeester
063d5679c5 Merge pull request #28919 from allencloud/change-secret-remove-in-cli 
change secret remove logic in cli
 2016-11-29 15:08:24 +01:00
Vincent Demeester
c1b0f23de0 Merge pull request #28893 from anusha-ragunathan/delete_onerr 
On plugin pull errors, delete created dirs.
 2016-11-29 14:48:27 +01:00
Vincent Demeester
986740691f Merge pull request #28874 from yuexiao-wang/fix-layer-typo 
Fix some typos
 2016-11-29 14:45:08 +01:00
yuexiao-wang
c8c7a3ff21 Fix some typos 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-30 03:01:32 +08:00
Yanqiang Miao
71f1205269 Fix some format errors 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-29 21:45:04 +08:00
Sebastiaan van Stijn
d5654a8e76 Merge pull request #28904 from dnephin/add-volume-labels-to-deploy 
Use namespace label on stack volumes
 2016-11-29 14:39:26 +01:00
Sebastiaan van Stijn
f06c2f230a Merge pull request #28819 from yuexiao-wang/modify-link 
Modify the link about config.json for docker plugin create
 2016-11-29 14:28:32 +01:00
Ke Li
da6944ec87 Initialize field with name 
Signed-off-by: Ke Li <kel@splunk.com>
 2016-11-29 19:36:56 +08:00
allencloud
5b93e77138 change secret remove logic in cli 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-29 15:12:05 +08:00
Doug Davis
1ef10c83c7 Merge pull request #28909 from Microsoft/jjh/moreworkdir2 
WORKDIR set cmd
 2016-11-28 20:35:21 -05:00
Aaron Lehmann
9dba9e3248 cluster: Refuse swarm spec not named "default" 
If, using the API, a user submits an init request with a spec that has a
name other than "default", the engine will rename the "default" cluster
object. Some parts of swarmkit depend on having a cluster object named
"default". Reject any specs that use other names.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-28 17:19:29 -08:00
Anusha Ragunathan
9e4234261c On plugin pull errors, delete created dirs. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-28 16:57:27 -08:00
Dong Chen
abcb699ad1 Fix network attachable option. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2016-11-28 16:54:56 -08:00
Sebastiaan van Stijn
66154d0888 Merge pull request #28906 from mstanleyjones/udp_port_publishing 
Document publishing a UDP port
 2016-11-29 00:57:41 +01:00
Brian Goff
0b04f1dca2 Merge pull request #28898 from vdemeester/fix-imagelist-retrocompat 
Fixes ImageList to be retro-compatible with older API
 2016-11-28 18:57:13 -05:00
John Howard
1b97bb416b WORKDIR set cmd 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 15:44:10 -08:00
Josh Hawn
eeac871946 Reject unspecified advertise addr on swarm init 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2016-11-28 15:44:06 -08:00
Misty Stanley-Jones
2178c840ba Document publishing a UDP port 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 15:41:56 -08:00
Tibor Vass
584d23d849 Merge pull request #28897 from anusha-ragunathan/plugin_exit 
Fix issue with plugin exit.
 2016-11-28 15:25:27 -08:00
Daniel Nephin
4013a7c6d8 Use namespace label on stack volumes. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-28 18:02:39 -05:00
Victor Vieux
13ce1fe5a9 Merge pull request #28901 from thaJeztah/carry-28783-update-plugin-example 
[carry 28783] update plugin example
 2016-11-28 14:45:47 -08:00
Victor Vieux
d73f73b365 update plugin example 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

cleanup whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-28 23:44:24 +01:00
Brian Goff
8c2e674551 Merge pull request #28776 from Microsoft/jjh/fix28775 
Align output of docker version again
 2016-11-28 17:02:17 -05:00
Vincent Demeester
c6e31454ba
Fixes ImageList to be retro-compatible with older API 
Make sure current client code can talk for ImageList can still talk to
older daemon.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 22:15:50 +01:00
Anusha Ragunathan
890a98ceed Fix issue with plugin exit. 
A plugin has an `ExitChan` channel which is used to signal the exit of
the plugin process. In a recent change, the initialization was
incorrectly moved to the daemon Shutdown path.

Fix this by initializing the channel during plugin enable.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-28 12:48:56 -08:00
Yong Tang
662d456928 Fix issue caused by duplicate docker plugin create with same names 
This fix tries to fix the issue raised in 28684:
1. Duplicate plugin create with the same name will override the old plugin reference
2. In case an error happens in the middle of the plugin creation, plugin directories
   in `/var/lib/docker/plugins` are not cleaned up.

This fix update the plugin store so that `Add()` will return an error if a plugin
with the same name already exist.

This fix also will clean up the directory in `/var/lib/docker/plugins` in case
an error happens in the middle of the plugin creation.

This fix fixes 28684.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-28 12:37:49 -08:00
Vincent Demeester
60e72ea379 Merge pull request #28734 from ipbabble/master 
Added and example of using --format with docker images
 2016-11-28 20:57:13 +01:00
John Howard
dfeaf7a959 Align output of docker version again 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 11:38:58 -08:00
Vincent Demeester
3ccc4bc370 Merge pull request #28792 from yuexiao-wang/restart-mgr 
Optimize the unit test for restartmanager
 2016-11-28 20:27:44 +01:00
John Howard
b9e65f40cf Windows: Note about volumes in run 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 11:06:01 -08:00
Sebastiaan van Stijn
0e0a5e0d39 Merge pull request #28891 from mstanleyjones/fix_doubled_words 
Fix instances of doubled words
 2016-11-28 19:57:17 +01:00
Sebastiaan van Stijn
1a710b1585 Merge pull request #28890 from mstanleyjones/fix_is-official 
Fix copypaste error 'is-automated'
 2016-11-28 19:53:02 +01:00
Misty Stanley-Jones
379e9259cf Fix instances of doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 10:48:45 -08:00
Misty Stanley-Jones
2333657e1b Fix copypaste error 'is-automated' 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 10:31:38 -08:00
Doug Davis
937027a0cb Merge pull request #28514 from Microsoft/jjh/workdir 
Refix COPY file . after WORKDIR (now always created)
 2016-11-28 12:58:17 -05:00
Sebastiaan van Stijn
35fd96f3f9 Merge pull request #28886 from mstanleyjones/fix_redirect_loop 
Fix some redirect loops and problems
 2016-11-28 18:49:36 +01:00
Misty Stanley-Jones
a1f55dca21 Fix some redirect loops and problems 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 09:46:38 -08:00
Kenfe-Mickaël Laventure
783d4ac6d4 Merge pull request #28625 from albers/completion-plugins 
Add bash completion for plugin API
 2016-11-28 08:56:53 -08:00
Vincent Demeester
b20bf510e5 Merge pull request #28822 from yuexiao-wang/modify-plugin 
Modify repoName to PLUGIN for docker plugin create
 2016-11-28 17:52:04 +01:00
Vincent Demeester
56a979801a Merge pull request #28877 from vdemeester/dont-export-accepted-filter 
AcceptedFilters in router/network/filter.go should not be exported
 2016-11-28 17:40:15 +01:00
Sebastiaan van Stijn
85a99c8891 Merge pull request #28657 from erxian/fix-doc-about-service-create 
fix doc about service create in docker_remote_api_v1.24.md
 2016-11-28 16:06:50 +01:00
Antonio Murdaca
76459076c2 Merge pull request #28882 from vdemeester/remove-stack_config-doc 
Remove docker stack config commandline reference doc
 2016-11-28 15:34:29 +01:00