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

29502 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Aaron Lehmann
089842c4b4 Don't resolve or pull images referenced by ID 
If a swarm service is created using an image ID, it's useless to try to
pull this reference or resolve it to a manifest digest. Avoid doing this
when a fully qualified image ID is given.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-28 13:53:52 -08: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
John Howard
49f392ff6b Windows: Builder case insensitive env 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-28 10:30:45 -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
Vincent Demeester
eb55d03f3c
Revert "Add -a option to service/node ps" 
This reverts commit 139fff2bf0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 18:08:45 +01: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
Vincent Demeester
6fff845409
stack deploy: handle external network when deploying 
If the network is marked as external, don't use the namespace on
it. Otherwise, it's not found.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 17:38:41 +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
Sebastiaan van Stijn
c04cf54d4e Merge pull request #28865 from albers/docs-stack-ls-aliases 
Add aliases and options to `docker stack ls` docs
 2016-11-28 15:27:35 +01:00
Vincent Demeester
3f98871a19
Remove docker stack config commandline reference doc 
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 15:25:52 +01:00
Vincent Demeester
e517d7975e
AcceptedFilters in router/network/filter.go should not be exported 
It's not used elsewhere and doesn't need to be exported.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-28 14:14:50 +01:00
Justin Cormack
33b6ef02cb Merge pull request #28868 from ohmk/fix-a-description-of-docker-swarm-init 
fix description of 'docker swarm init'
 2016-11-28 04:11:31 -08:00
Ben Firshman
bf6a790f00
Make swagger.yaml operationIds consistent 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
54051b18a1
Make docs URLs in swagger.yaml absolute 
This makes the swagger.yaml useful outside of the documentation.
For background:
https://github.com/docker/docker.github.io/pull/606#issuecomment-261389645

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:26 +00:00
Ben Firshman
2aea9ad56b
Improve tags in swagger.yaml 
- Consistent naming (plural, etc)
- Add section descriptions
- Add docs in swagger.yaml about how to maintain them

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Ben Firshman
be52738a2c
Add intro to swagger.yaml to explain what it's for 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:25 +00:00
Ben Firshman
d9b109b807
Fix headings in old API docs 
Jekyll automatically adds titles based on the title of the page,
so this was causing duplicate titles.

Also, made all the headings the correct level.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-28 11:24:22 +00:00
Kei Ohmura
4a3207de5b fix more according to the actual output of 'docker swarm init --help' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-11-28 18:40:11 +09:00
Kei Ohmura
3abee1bf8a fix description of 'docker swarm init' 
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
 2016-11-28 13:24:02 +09:00
Akihiro Suda
d5dee554ea Merge pull request #28857 from miaoyq/fix-a-description-of-docker-run 
Fix description and link  of 'docker run [-a]'
 2016-11-28 10:31:06 +09:00
Brian Goff
9439b2b7e2 Merge pull request #28866 from albers/completion-service--host 
Add bash completion for `docker service {create,update}` host options
 2016-11-27 20:22:02 -05:00
Harald Albers
f3b7f40aaf Add bash completion for docker service {create,update} host options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-27 05:08:35 -08:00
Steve Durrheimer
1e0c612f84
Add zsh completion for 'docker stack' subcommand 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-27 13:59:48 +01:00
Harald Albers
8260366dd2 Add aliases and options to docker stack ls docs 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-27 04:38:49 -08:00
Sebastiaan van Stijn
9dc0c8ec32 Merge pull request #28824 from lixiaobing10051267/masterPlugin2 
modify invalid url in plugins_network.md
 2016-11-26 23:22:52 +01:00
Harald Albers
ecb707cb0f Add bash completion for plugin API 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-26 11:04:55 -08:00
Harald Albers
16494a81f9 Add bash completion for docker stack 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-26 10:45:07 -08:00
Yanqiang Miao
08ff4f427e Fix a description of 'docker run [-a]' 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-26 22:56:29 +08:00
Antonio Murdaca
76a0dfaa8e Merge pull request #28710 from miaoyq/eliminate-redundant-parameters 
Eliminate the redundant parameter
 2016-11-26 14:37:17 +01:00
Antonio Murdaca
ce0068ed04 Merge pull request #28780 from vieux/accept_src_in_secret 
support src in --secret
 2016-11-26 14:34:30 +01:00
Antonio Murdaca
022c13271b Merge pull request #28829 from lixiaobing10051267/masterDaemon 
check typos and fix in daemon directory
 2016-11-26 14:33:09 +01:00
Antonio Murdaca
2f5dbd63b0 Merge pull request #28855 from YuPengZTE/devMD023 
fix the typo
 2016-11-26 14:31:54 +01:00