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

25105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tibor Vass
061bbaf7a4 Merge pull request #23681 from tiborvass/plugins-fixes 
Plugins fixes
 2016-06-17 12:58:36 -07:00
Tibor Vass
bd86644995 Merge pull request #23687 from mrjana/vendor 
Vendoring libnetwork @13be89d1cf79
 2016-06-17 12:05:56 -07:00
Tibor Vass
8ba17b4823 plugins: fix name handling for legacy plugins 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 12:02:05 -07:00
Alexander Morozov
c1dd933c02 Merge pull request #23550 from swernli/execTTYFix 
Fixing bug in AttachStreams that would fail to close StdIn
 2016-06-17 11:19:28 -07:00
Tibor Vass
82c9410c41 Merge pull request #23688 from tonistiigi/nl 
Add newline to promote/demote message
 2016-06-17 11:04:25 -07:00
Tonis Tiigi
3386e3570a Add newline to promote/demote message 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-17 10:58:11 -07:00
Tibor Vass
83e31c8765 Merge pull request #23682 from mrjana/bug 
Check if DriverState is valid before using in convert
 2016-06-17 10:56:40 -07:00
Tibor Vass
2bd34b858d Merge pull request #23676 from avsm/swarm-cli-consistency 
`docker swarm`: more consistent CLI help
 2016-06-17 10:55:15 -07:00
Antonio Murdaca
e72b7ee425 Merge pull request #23664 from leonhartX/i23017 
fix #23017, add zsh completion for dockerd
 2016-06-17 19:44:43 +02:00
Jana Radhakrishnan
70e2585d54 Vendoring libnetwork @13be89d1cf79 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-17 10:27:34 -07:00
Vincent Demeester
cb321e82db Update plugin command with defaulttag 
This way, you don't have to specify the ":latest" tag for some command
and not for others

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-17 10:18:18 -07:00
Tibor Vass
65ed9daf70 plugins: fix usage for plugin commands 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 10:03:30 -07:00
Tibor Vass
15ff9de658 plugins: remove automatic mounting of a state dir 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 10:03:30 -07:00
Tibor Vass
4b70d4561e plugins: install should not automatically accept all permissions 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-06-17 10:03:30 -07:00
Tibor Vass
906c1dc5a0 Merge pull request #23675 from anusha-ragunathan/add_disable 
Add disable flag for plugin Install.
 2016-06-17 09:38:26 -07:00
Jana Radhakrishnan
4fea81154b Check if DriverState is valid before using in convert 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2016-06-17 09:17:03 -07:00
Vincent Demeester
6d47b06094 Merge pull request #23663 from albers/completion-swarm-update--cert-expiry 
bash completion for `docker swarm update --cert-expiry`
 2016-06-17 18:15:56 +02:00
Arnaud Porterie
83658c5b64 Merge pull request #23674 from justincormack/accepted 
Missing line feed after accepting node
 2016-06-17 16:08:37 +00:00
Arnaud Porterie
27e9ae3141 Merge pull request #23673 from justincormack/invalud 
fix invalid typo in error message
 2016-06-17 16:08:14 +00:00
Anil Madhavapeddy
0ec78739ac docker swarm: more consistent CLI help 
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
 2016-06-17 16:34:06 +01:00
Justin Cormack
c34d752419 Missing line feed after accepting node 
Avoids
```
root@swarmatorium:~# docker node accept 3dnh6k13o44np9fwl83e7gh80
Node 3dnh6k13o44np9fwl83e7gh80 accepted in the swarm.root@swarmatorium:~#
```

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-17 15:49:35 +01:00
Anusha Ragunathan
22e781e8e3 Add disable flag for plugin Install. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-06-17 07:48:43 -07:00
Justin Cormack
2322ccb8ff fix invalid typo in error message 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-06-17 15:27:54 +01:00
Ke Xu
bd1fc1e5c2 fix #23017, add zsh completion for dockerd 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-17 16:16:13 +09:00
Harald Albers
dc2fc75d42 bash completion for docker swarm update --cert-expiry 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-17 08:49:06 +02:00
Sebastiaan van Stijn
8f9c7fab24 Merge pull request #23656 from sfsmithcha/check_cmd_line 
update output for node commands, minor edits
 2016-06-16 22:54:28 -07:00
Charles Smith
3b2132c2c7 update output for node commands, minor edits 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-06-16 21:44:07 -07:00
Tibor Vass
a3795ca13e Merge pull request #23652 from dnephin/better-bundle-load-errors 
Improve the error messages for loading a bundle
 2016-06-16 21:40:30 -07:00
Arnaud Porterie
4c5f1a7e5b Merge pull request #23647 from vieux/improve_messages_node_cmds 
improve some messages in the node subcmds
 2016-06-17 03:20:30 +00:00
Arnaud Porterie
f52c807650 Merge pull request #23651 from tonistiigi/cert-expiry 
Add cert-expiry to swarm update
 2016-06-17 02:50:58 +00:00
Tonis Tiigi
a933ac3c27 Add integration test for parsing swarm update options 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 19:50:01 -07:00
Tibor Vass
a590a6b180 Merge pull request #23532 from swernli/exitCodeFix 
Fixing exit code return on error case in Windows.
 2016-06-16 19:01:18 -07:00
Tibor Vass
f522ed9752 Merge pull request #23580 from cpuguy83/plugin_restore 
Fix removing plugins and Implement plugin restore after daemon restart
 2016-06-16 18:54:57 -07:00
Victor Vieux
eb962235fb improve some messages in the node subcmds 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-16 18:53:24 -07:00
Arnaud Porterie
f4de3f314e Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
 2016-06-17 01:40:45 +00:00
Arnaud Porterie
edfd546a6f Merge pull request #23637 from vieux/add_more_fields_inspect 
add some more fields in docker service inspect -p
 2016-06-17 01:40:26 +00:00
Arnaud Porterie
0ef720eded Merge pull request #23643 from tonistiigi/membership 
Return membership status on join without timeout
 2016-06-17 01:40:06 +00:00
Tonis Tiigi
7d8d51aa9d Add cert-expiry to swarm update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 18:06:02 -07:00
Arnaud Porterie
16a6987a00 Merge pull request #23549 from dmcgowan/reference-ui-updates 
Do not show empty tags for digest references in output
 2016-06-17 00:47:49 +00:00
Stefan J. Wernli
176345435b Fixing bug in AttachStreams that would fail to close StdIn 
During a docker exec, if no TTY is specified, the code would still leave stdin open instead of closing it. This change adds handling for the execConfig TTY bool that mirrors what is already done for container config. (Updated this change to be Windows only.)

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
 2016-06-16 17:34:45 -07:00
Arnaud Porterie
6d9d149f99 Merge pull request #23648 from thaJeztah/fix-overlay-overlay2 
fix "overlay" -> "overlay2" in error message
 2016-06-17 00:21:53 +00:00
Arnaud Porterie
7ef9aec90f Merge pull request #23570 from vdemeester/change-plugin-install 
Update docker plugin install code…
 2016-06-17 00:12:56 +00:00
Sebastiaan van Stijn
314d9dc03a Merge pull request #23646 from thaJeztah/update-docker-info 
Update docker info output example
 2016-06-16 16:45:44 -07:00
Sebastiaan van Stijn
2d4b285a75
fix "overlay" -> "overlay2" in error message 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 16:42:40 -07:00
Sebastiaan van Stijn
07e1c62bf4
Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-16 16:29:23 -07:00
Victor Vieux
4c9e21b674 add some more fields in docker service inspect -p 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-06-16 16:22:11 -07:00
Michael Crosby
eb6cc31802 Merge pull request #23639 from mavenugo/ln-rc2 
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
 2016-06-16 16:17:07 -07:00
Tonis Tiigi
826f6f0703 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-16 16:08:15 -07:00
Vincent Demeester
4a70cb5571
Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-17 00:47:22 +02:00
Michael Crosby
2fa38a9144 Merge pull request #23641 from justincormack/s390seccomp 
Add the seccomp build tag for s390x now runc updated
 2016-06-16 15:46:14 -07:00