65c6cdf69c
Migrate info command to cobra
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: ac7a663c0b0ae147f42048dbc19e933635e22f75
Component: engine
2016-06-17 22:11:33 +02:00
81bc9e5cf8
Merge pull request #23681 from tiborvass/plugins-fixes
...
Plugins fixes
Upstream-commit: 061bbaf7a4b363ffa9b2b04b8277761f28a4a289
Component: engine
2016-06-17 12:58:36 -07:00
ebcef72412
Merge pull request #23687 from mrjana/vendor
...
Vendoring libnetwork @13be89d1cf79
Upstream-commit: bd8664499528a0a446c097da80938139104a933d
Component: engine
2016-06-17 12:05:56 -07:00
4552e85448
plugins: fix name handling for legacy plugins
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 8ba17b4823f9a1a40a405905613667d97bb24546
Component: engine
2016-06-17 12:02:05 -07:00
7c70b5ec64
Merge pull request #23550 from swernli/execTTYFix
...
Fixing bug in AttachStreams that would fail to close StdIn
Upstream-commit: c1dd933c029d425ad8f5c3787d9b591ca216e08f
Component: engine
2016-06-17 11:19:28 -07:00
516f943b0e
Merge pull request #23688 from tonistiigi/nl
...
Add newline to promote/demote message
Upstream-commit: 82c9410c41c7e34939d17fa5edcba2d1d0e4d686
Component: engine
2016-06-17 11:04:25 -07:00
5687ad8aed
Add newline to promote/demote message
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3386e3570a1251bbea5302d8b8e639aaf68436c3
Component: engine
2016-06-17 10:58:11 -07:00
f8e31ac03e
Merge pull request #23682 from mrjana/bug
...
Check if DriverState is valid before using in convert
Upstream-commit: 83e31c876516313d48e50311cc59f0675087eabb
Component: engine
2016-06-17 10:56:40 -07:00
82e43b2685
Merge pull request #23676 from avsm/swarm-cli-consistency
...
`docker swarm`: more consistent CLI help
Upstream-commit: 2bd34b858d7cc374169433eb0538a4dbe48cff3f
Component: engine
2016-06-17 10:55:15 -07:00
095a6d0749
Merge pull request #23664 from leonhartX/i23017
...
fix #23017 , add zsh completion for dockerd
Upstream-commit: e72b7ee425d9be8c1ac64580596db69912025513
Component: engine
2016-06-17 19:44:43 +02:00
101ca2b440
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 70e2585d545e18757222b8ccfb21514fde7c42f4
Component: engine
2016-06-17 10:27:34 -07:00
089ba4264f
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 >
Upstream-commit: cb321e82db662f5190a6d83a90677a9dd9fdcd31
Component: engine
2016-06-17 10:18:18 -07:00
eeb8ef5ac1
plugins: fix usage for plugin commands
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 65ed9daf70ccf0027f4eac8049667130deb249ed
Component: engine
2016-06-17 10:03:30 -07:00
bc663a35ec
plugins: remove automatic mounting of a state dir
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 15ff9de65801178a522c445ff9fb8964e21d12a0
Component: engine
2016-06-17 10:03:30 -07:00
dc0392a7ed
plugins: install should not automatically accept all permissions
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 4b70d4561e4a9b57d80b70cfebc50831e230735a
Component: engine
2016-06-17 10:03:30 -07:00
e5e1b41404
Merge pull request #23675 from anusha-ragunathan/add_disable
...
Add disable flag for plugin Install.
Upstream-commit: 906c1dc5a07827d48bede8e73e4b8673f711eea0
Component: engine
2016-06-17 09:38:26 -07:00
def8da9f42
Check if DriverState is valid before using in convert
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 4fea81154b817b09e553308a1595bfd97a8c0582
Component: engine
2016-06-17 09:17:03 -07:00
297c4a4979
Merge pull request #23663 from albers/completion-swarm-update--cert-expiry
...
bash completion for `docker swarm update --cert-expiry`
Upstream-commit: 6d47b06094ffa04a6299b7c5a61beb3cbe2e655b
Component: engine
2016-06-17 18:15:56 +02:00
79014c743c
Merge pull request #23674 from justincormack/accepted
...
Missing line feed after accepting node
Upstream-commit: 83658c5b64413ee6df4c64dcf98acbd407c6f570
Component: engine
2016-06-17 16:08:37 +00:00
6ddced327d
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 >
Upstream-commit: 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8
Component: engine
2016-06-17 16:34:06 +01:00
c99aad7fca
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 >
Upstream-commit: c34d752419f0e9c17aa759df1a8314974b0d17ed
Component: engine
2016-06-17 15:49:35 +01:00
a9608bfa10
Add disable flag for plugin Install.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 22e781e8e3ae1d1ab62ddcda983cabfde2e08ad4
Component: engine
2016-06-17 07:48:43 -07:00
71af4dcb33
fix invalid typo in error message
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 2322ccb8fff46a4d3a84f3ef214cb473816374af
Component: engine
2016-06-17 15:27:54 +01:00
3a6f26e8f3
fix #23017 , add zsh completion for dockerd
...
Signed-off-by: Ke Xu <leonhartx.k@gmail.com >
Upstream-commit: bd1fc1e5c26b954fb35f7adda46d764d80a1a570
Component: engine
2016-06-17 16:16:13 +09:00
6b5e5294c2
bash completion for docker swarm update --cert-expiry
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
2016-06-17 08:49:06 +02:00
f2adde44a9
Merge pull request #23656 from sfsmithcha/check_cmd_line
...
update output for node commands, minor edits
Upstream-commit: 8f9c7fab24d777e5ade6ed75f01e15e4b0fde79c
Component: engine
2016-06-16 22:54:28 -07:00
913871096c
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 3b2132c2c7f277750edfd9fc76d73dbb9142fde2
Component: engine
2016-06-16 21:44:07 -07:00
800ec66e2d
Merge pull request #23652 from dnephin/better-bundle-load-errors
...
Improve the error messages for loading a bundle
Upstream-commit: a3795ca13ef031b6b2a17fad488c839281cd1de2
Component: engine
2016-06-16 21:40:30 -07:00
f381416006
Merge pull request #23647 from vieux/improve_messages_node_cmds
...
improve some messages in the node subcmds
Upstream-commit: 4c5f1a7e5bfb49647eeb76d20628c7daac65ef8d
Component: engine
2016-06-17 03:20:30 +00:00
bfa982122e
Merge pull request #23651 from tonistiigi/cert-expiry
...
Add cert-expiry to swarm update
Upstream-commit: f52c807650beb3bb0afe67bafd546792d7fa1422
Component: engine
2016-06-17 02:50:58 +00:00
7f08beb5b2
Add integration test for parsing swarm update options
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: a933ac3c27ac88cf69a2bc2bc16ce076486c0206
Component: engine
2016-06-16 19:50:01 -07:00
69096baccb
Merge pull request #23532 from swernli/exitCodeFix
...
Fixing exit code return on error case in Windows.
Upstream-commit: a590a6b1800778c86f6649b64283d29d14d83024
Component: engine
2016-06-16 19:01:18 -07:00
92262b0c41
Merge pull request #23580 from cpuguy83/plugin_restore
...
Fix removing plugins and Implement plugin restore after daemon restart
Upstream-commit: f522ed9752f0075bc856c06639d4a408a23d6e35
Component: engine
2016-06-16 18:54:57 -07:00
a992434a69
improve some messages in the node subcmds
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: eb962235fbf1579cf36bb0582347e8639ec47205
Component: engine
2016-06-16 18:53:24 -07:00
79ea0079e7
Merge pull request #23644 from tonistiigi/fix-leave-delete
...
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
2016-06-17 01:40:45 +00:00
c1713ee511
Merge pull request #23637 from vieux/add_more_fields_inspect
...
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
2016-06-17 01:40:26 +00:00
048ffaf8b1
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
2016-06-17 01:40:06 +00:00
1c57d98347
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 7d8d51aa9d0c1737ff7f97a3efac0a2ef0975b56
Component: engine
2016-06-16 18:06:02 -07:00
433425402a
Merge pull request #23549 from dmcgowan/reference-ui-updates
...
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
2016-06-17 00:47:49 +00:00
c0affdfcf8
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 >
Upstream-commit: 176345435b33ecbb725cac995083fab0462f60e3
Component: engine
2016-06-16 17:34:45 -07:00
0cc35ac1ec
Merge pull request #23648 from thaJeztah/fix-overlay-overlay2
...
fix "overlay" -> "overlay2" in error message
Upstream-commit: 6d9d149f9980cfda8ed3eeed7446c068de7ae8b6
Component: engine
2016-06-17 00:21:53 +00:00
cfbfd0a0b9
Merge pull request #23570 from vdemeester/change-plugin-install
...
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
2016-06-17 00:12:56 +00:00
8cac554b16
Merge pull request #23646 from thaJeztah/update-docker-info
...
Update docker info output example
Upstream-commit: 314d9dc03a1623b40a3dc49a666f720508ea67d4
Component: engine
2016-06-16 16:45:44 -07:00
d903446499
fix "overlay" -> "overlay2" in error message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2d4b285a75621604f31058a43cb5ef1d4618533e
Component: engine
2016-06-16 16:42:40 -07:00
d74065d7d9
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
2016-06-16 16:29:23 -07:00
9dba03a4c5
add some more fields in docker service inspect -p
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
2016-06-16 16:22:11 -07:00
2eb1181d59
Merge pull request #23639 from mavenugo/ln-rc2
...
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
2016-06-16 16:17:07 -07:00
dae11af952
Fix removing containers on leaving from pending state
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
2016-06-16 16:08:15 -07:00
97ce44d0ef
Update ServiceInspectWithRaw
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
2016-06-17 00:47:22 +02:00
97c2dadb96
Merge pull request #23641 from justincormack/s390seccomp
...
Add the seccomp build tag for s390x now runc updated
Upstream-commit: 2fa38a91441a1b8e610925f41eaba70aa8ca8e58
Component: engine
2016-06-16 15:46:14 -07:00
