Vincent Demeester
c5eb1854fa
Migrate import command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9d2e8abd302ae72e4dd5bddf325eb921a9e73a1b
Component: engine
2016-06-06 13:58:23 +02:00
Vincent Demeester
d04d755b65
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: ca01e57d55699ab9e30f120a1de9d00a477547ad
Component: engine
2016-06-06 13:58:18 +02:00
Sebastiaan van Stijn
278d68e5ce
Merge pull request #23210 from vdemeester/migrate-network-command-to-cobra
...
Use spf13/cobra for docker network and subcommands
Upstream-commit: 07a7c0632f7b1ae70b5261565742756b76df7402
Component: engine
2016-06-06 13:51:57 +02:00
Vincent Demeester
d678f7748b
Merge pull request #23129 from WeiZhang555/print-detailed-error
...
Print original error for `start`
Upstream-commit: 9d449d89f7949aea708125badfbaebc65440b98d
Component: engine
2016-06-06 13:43:52 +02:00
Vincent Demeester
4be970b656
Merge pull request #23299 from albers/completion-dockerd-path
...
fix bash completion for dockerd invoked with path
Upstream-commit: 4b2b5214a46563caedab0c30314fe2c0e8849516
Component: engine
2016-06-06 13:40:15 +02:00
Sebastiaan van Stijn
977029fee5
Merge pull request #23293 from mountkin/network-docs
...
docs: correct network create command
Upstream-commit: ac14aa11b6f9172c744affa9823d05fde721c5e0
Component: engine
2016-06-06 12:07:23 +02:00
Sebastiaan van Stijn
3928864f0e
Merge pull request #23295 from sdurrheimer/zsh-completion-search-limit
...
Add zsh completion for 'docker search --limit'
Upstream-commit: ab0c683f5db26a16c91687ac8798129ca0840b30
Component: engine
2016-06-06 11:46:57 +02:00
Vincent Demeester
62fb401985
Migrate network command to cobra
...
- Migrates network command and subcommands (connect, create, disconnect,
inspect, list and remove) to spf13/cobra
- Create a RequiredExactArgs helper function for command that require an
exact number of arguments.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 4bd202b00f7859ebeb4ba87511a0618ad08d0605
Component: engine
2016-06-06 10:28:52 +02:00
Vincent Demeester
fd0727c3a3
Merge pull request #22077 from cpuguy83/remote_volplugin_caps
...
Add support for volume scopes
Upstream-commit: 28dde09cdf2a48dcdb6ce665cd2b912175dfb871
Component: engine
2016-06-06 10:15:43 +02:00
Harald Albers
82bf916d89
fix bash completion for dockerd with path
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e8c67e8d8d8d4570d78e21eae02451f27a372f83
Component: engine
2016-06-06 10:01:15 +02:00
Vincent Demeester
a515195bc2
Merge pull request #23098 from capkurmagati/23097-fix-zsh-completion-docker-rm-f
...
fixes #23097 zsh completion on `docker rm -f`
Upstream-commit: 3ac1787b7e60f0ee3d09f4fd1cd95b416dfe4ac0
Component: engine
2016-06-06 09:20:16 +02:00
Vincent Demeester
b24dce4b03
Merge pull request #23284 from yongtang/23211-spf13-cobra-logs
...
Use spf13/cobra for docker logs
Upstream-commit: 731bae674965a3ae8a300d8e285927f993727bab
Component: engine
2016-06-06 09:06:51 +02:00
Steve Durrheimer
2d5dd957d0
Add zsh completion for 'docker search --limit'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 41f2183f8afe6c1ee8cf650a33bfb8ac0fb5f255
Component: engine
2016-06-06 09:05:22 +02:00
Vincent Demeester
bbcce85205
Merge pull request #23283 from yongtang/23211-spf13-cobra-diff
...
Use spf13/cobra for docker diff
Upstream-commit: 2becfab55fd8ad6ec1d02aea3cd6498a2f91ef68
Component: engine
2016-06-06 09:05:18 +02:00
Vincent Demeester
787bdacdff
Merge pull request #23268 from WeiZhang555/cobra-start
...
Migrate start command to cobra
Upstream-commit: c35d9f2611c4b1e43403010210708d9c50b838db
Component: engine
2016-06-06 08:59:42 +02:00
Shijiang Wei
f0fedf722a
docs: correct network create command
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 041aad6d7200a5b53204d95e9cc5505bf4d201cf
Component: engine
2016-06-06 13:50:29 +08:00
Vincent Demeester
f3da357c3a
Merge pull request #23279 from yongtang/23211-spf13-cobra-unpause
...
Use spf13/cobra for docker unpause
Upstream-commit: b70dd0e04c621dc524397b0ef4583667b92df42c
Component: engine
2016-06-06 05:17:59 +02:00
Zhang Wei
3a2d4ddfd6
Log and print original error for start
...
Currently `start` will hide some errors and throw a consolidated error,
which will make it hard to debug because developer can't find the
original error.
This commit allow daemon to log original errors first.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: b4740e3021a39a502ffc82f0f70e9b7ed2f0875f
Component: engine
2016-06-06 10:13:49 +08:00
Zhang Wei
33bb9696ad
Migrate start command to cobra
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4f3625a2889aef4ea97e366fa0ed1e2383dd3aad
Component: engine
2016-06-06 09:53:18 +08:00
Yong Tang
3fc5fabb4a
Use spf13/cobra for docker unpause
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker unpause` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8ea7733a6390a67d6981888b857ab78b11c4c076
Component: engine
2016-06-05 17:29:52 -07:00
Yong Tang
58f3ee3285
Use spf13/cobra for docker logs
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker logs` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4f4b59cc435fbfef236017f3aa36145c1187426b
Component: engine
2016-06-05 15:51:35 -07:00
Alexander Morozov
03f6e5fc67
Merge pull request #23242 from vdemeester/migrate-rmi-to-cobra
...
Use spf13/cobra for docker rmi
Upstream-commit: e94be2f639804c5223ebb127faec845683410eb1
Component: engine
2016-06-05 15:29:01 -07:00
Yong Tang
9c145d0655
Use spf13/cobra for docker diff
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker diff` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5899afae52b10d2457848c6e62a7476835befef3
Component: engine
2016-06-05 15:13:55 -07:00
Sebastiaan van Stijn
1a2a5dd2e3
Merge pull request #23280 from icecrime/remove_num_commands_test
...
Remove unnecessary check for number of commands
Upstream-commit: 951702a5679b5220bfb02497bc76b65137dff1e3
Component: engine
2016-06-05 23:25:48 +02:00
Sebastiaan van Stijn
b09370648a
Merge pull request #23282 from yongtang/06052016-docs-typo
...
Fix a couple of typos in docker attach docs.
Upstream-commit: cfcb470aad367dea7b9f6df96ff12f577a22a2b0
Component: engine
2016-06-05 23:12:25 +02:00
Yong Tang
87e4691d16
Fix a couple of typos in docker attach docs.
...
This fix fixes a couple of typos in docker attach docs:
docs/reference/commandline/attach.md
man/docker-attach.1.md
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5667365ed1cddb57267f7c11fc1f9d92209e5aed
Component: engine
2016-06-05 14:03:23 -07:00
Vincent Demeester
7339550c4b
Use spf13/cobra for docker rmi
...
Moves image command rmi to `api/client/image/remove.go` and use cobra :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 60e48bd6bd24c559ed92c7217cd7798c85cbb644
Component: engine
2016-06-05 22:40:35 +02:00
Brian Goff
78cd3d76ac
Merge pull request #23247 from thaJeztah/carry-22033-docker-ps-format-output
...
[Carry 22033] Add a check for size field in custom format string
Upstream-commit: 1a1083ae75ac0b1018510ab80bffeab415220886
Component: engine
2016-06-05 16:39:22 -04:00
Vincent Demeester
cacb039bc5
Merge pull request #23276 from yongtang/23211-spf13-cobra-stop
...
Use spf13/cobra for docker stop
Upstream-commit: b25955833652b6b2079d7f3ac56759c563639ca9
Component: engine
2016-06-05 22:37:15 +02:00
Brian Goff
6075499108
Merge pull request #23063 from yongtang/22961-aws-sdk-go
...
Update aws-sdk-go to v1.1.30
Upstream-commit: 3f970819bb4231375f7821aa54670fd59e384f4d
Component: engine
2016-06-05 16:01:52 -04:00
Brian Goff
b4d6cb3999
Merge pull request #23272 from thaJeztah/update-syntax
...
Update Dockerfile highlight/syntax definitions
Upstream-commit: 282067e83aef3164cd7a26df7c3169924bdc3f10
Component: engine
2016-06-05 15:38:16 -04:00
Brian Goff
da4d783e80
Add support for volume scopes
...
This is similar to network scopes where a volume can either be `local`
or `global`. A `global` volume is one that exists across the entire
cluster where as a `local` volume exists on a single engine.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2f40b1b281a3be8f34d82a5170988ee46ea1f442
Component: engine
2016-06-05 15:37:15 -04:00
Brian Goff
6e1304c58a
Enhance pluginrpc-gen parser
...
Now handles `package.Type` and `*package.Type`
Fixes parsing issues with slice and map types.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79ff6eaf21dfebad0f8131a1ede235249cd6638f
Component: engine
2016-06-05 15:37:15 -04:00
Arnaud Porterie (icecrime)
472381db0b
Remove unnecessary check for number of commands
...
Testing for the number of commands in `help` output doesn't seem to
contribute much to the quality of the project, and adds additional
burden for the developer to update.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: dd7e59a40a4c93070f71adb3ec74021241586c21
Component: engine
2016-06-05 11:44:50 -07:00
Sebastiaan van Stijn
7f305e8128
Merge pull request #23267 from vdemeester/migrate-export-to-cobra
...
Use spf13/cobra for docker export
Upstream-commit: c764234c3b4490a7b6cd6239607996c502d9ce22
Component: engine
2016-06-05 20:05:51 +02:00
Sebastiaan van Stijn
6f99fdfc2a
Merge pull request #23273 from vdemeester/deprecated-import-3-args
...
Deprecated the old 3-args form of `docker import`
Upstream-commit: 3cec9002714ee9227f75beeeccea7788a81d1fc1
Component: engine
2016-06-05 20:02:33 +02:00
Yong Tang
236aacaf44
Use spf13/cobra for docker stop
...
This fix is part of the effort to convert commands to spf13/cobra #23211 .
Thif fix coverted command `docker stop` to use spf13/cobra
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 63d66d2796fa1916a6b40913a6a23063d6169d17
Component: engine
2016-06-05 10:25:21 -07:00
Brian Goff
0978ffe8f4
Merge pull request #23258 from allencloud/return-err-when-volume-list-fails
...
return err when volume list fails
Upstream-commit: 506e8eda40d4c0efdb9b474fc71c01cabf08e404
Component: engine
2016-06-05 13:24:25 -04:00
Vincent Demeester
696ad0d43f
Deprecated the old 3-args form of docker import
...
It's been deprecated since November 2013 and v0.6.7. Removing the cli
side of it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 372063ce1bd0e36e3523360b88e74a1cef55b841
Component: engine
2016-06-05 18:07:34 +02:00
Brian Goff
5598c44830
Merge pull request #23271 from albers/completion-events-detach
...
bash completion for detach events
Upstream-commit: a15bc261dec0d8d45db13b38eb9768bcdad9fbd5
Component: engine
2016-06-05 11:53:01 -04:00
Sebastiaan van Stijn
363b704890
Update Dockerfile highlight definitions
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4cb71f80823af345d063cf0ad657e73ce9caa75f
Component: engine
2016-06-05 17:45:21 +02:00
Vincent Demeester
86b04a6a8a
Merge pull request #22489 from Microsoft/jjh/shell
...
Builder shell configuration
Upstream-commit: df1dd1322d5c9527be7187038ca3480404b1282b
Component: engine
2016-06-05 17:43:12 +02:00
Harald Albers
79a999e4d7
bash completion for detach events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9c9cbd2c0fbaef9afe740cf9b2acab0768d0fa99
Component: engine
2016-06-05 08:41:58 -07:00
Vincent Demeester
e533330f0a
Migrate export command to cobra
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b25e64183cd02bffe1ac1600e860551fca05d1f3
Component: engine
2016-06-05 16:42:19 +02:00
Vincent Demeester
a60f675fa0
Merge pull request #22988 from calavera/use_client_credentials_library
...
Move native credentials lookup to the client library.
Upstream-commit: 0f13b69fe26f98c3e06581dc5c61ce0a5065c739
Component: engine
2016-06-05 16:27:15 +02:00
David Calavera
c20d19fe6d
Use docker-credential-helpers client to talk with native creds stores.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ff3e187cc7a56ce102a61c1a4883f57fb1aed2f7
Component: engine
2016-06-04 10:08:22 -07:00
David Calavera
bd5e8e3754
Vendor docker-credential-helpers v0.3.0
...
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: feab8db60da39ecda00c86b34bf5958ae257a14f
Component: engine
2016-06-04 10:06:07 -07:00
Sebastiaan van Stijn
cfe1b2e499
Merge pull request #23253 from vdemeester/carry-pr-23159
...
Carry #23159 : Use spf13/cobra for `docker run` and `docker create`
Upstream-commit: 6b4a46f28266031ce1a1315f17fb69113a06efe1
Component: engine
2016-06-04 18:55:23 +02:00
Sebastiaan van Stijn
94d397a21a
Merge pull request #23257 from vdemeester/cobra-see-help
...
Cobra - display "See 'docker cmd --help'." in error cases
Upstream-commit: e556d6b6674193d37930edd722095fe487e16a09
Component: engine
2016-06-04 18:37:14 +02:00
allencloud
b8e65d7c23
return err when volume list fails
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: ed2d300ed054c10da65818904d40cfac678ada6d
Component: engine
2016-06-04 23:24:14 +08:00