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

24656 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
ac14aa11b6 Merge pull request #23293 from mountkin/network-docs 
docs: correct network create command
 2016-06-06 12:07:23 +02:00
Sebastiaan van Stijn
ab0c683f5d Merge pull request #23295 from sdurrheimer/zsh-completion-search-limit 
Add zsh completion for 'docker search --limit'
 2016-06-06 11:46:57 +02:00
Vincent Demeester
28dde09cdf Merge pull request #22077 from cpuguy83/remote_volplugin_caps 
Add support for volume scopes
 2016-06-06 10:15:43 +02:00
Vincent Demeester
3ac1787b7e Merge pull request #23098 from capkurmagati/23097-fix-zsh-completion-docker-rm-f 
fixes #23097 zsh completion on `docker rm -f`
 2016-06-06 09:20:16 +02:00
Vincent Demeester
731bae6749 Merge pull request #23284 from yongtang/23211-spf13-cobra-logs 
Use spf13/cobra for docker logs
 2016-06-06 09:06:51 +02:00
Steve Durrheimer
41f2183f8a
Add zsh completion for 'docker search --limit' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-06-06 09:05:22 +02:00
Vincent Demeester
2becfab55f Merge pull request #23283 from yongtang/23211-spf13-cobra-diff 
Use spf13/cobra for docker diff
 2016-06-06 09:05:18 +02:00
Vincent Demeester
c35d9f2611 Merge pull request #23268 from WeiZhang555/cobra-start 
Migrate start command to cobra
 2016-06-06 08:59:42 +02:00
Shijiang Wei
041aad6d72 docs: correct network create command 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-06-06 13:50:29 +08:00
Vincent Demeester
b70dd0e04c Merge pull request #23279 from yongtang/23211-spf13-cobra-unpause 
Use spf13/cobra for docker unpause
 2016-06-06 05:17:59 +02:00
Zhang Wei
4f3625a288 Migrate start command to cobra 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-06-06 09:53:18 +08:00
Yong Tang
8ea7733a63 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>
 2016-06-05 17:29:52 -07:00
Yong Tang
4f4b59cc43 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>
 2016-06-05 15:51:35 -07:00
Alexander Morozov
e94be2f639 Merge pull request #23242 from vdemeester/migrate-rmi-to-cobra 
Use spf13/cobra for docker rmi
 2016-06-05 15:29:01 -07:00
Yong Tang
5899afae52 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>
 2016-06-05 15:13:55 -07:00
Sebastiaan van Stijn
951702a567 Merge pull request #23280 from icecrime/remove_num_commands_test 
Remove unnecessary check for number of commands
 2016-06-05 23:25:48 +02:00
Sebastiaan van Stijn
cfcb470aad Merge pull request #23282 from yongtang/06052016-docs-typo 
Fix a couple of typos in docker attach docs.
 2016-06-05 23:12:25 +02:00
Yong Tang
5667365ed1 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>
 2016-06-05 14:03:23 -07:00
Vincent Demeester
60e48bd6bd
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>
 2016-06-05 22:40:35 +02:00
Brian Goff
1a1083ae75 Merge pull request #23247 from thaJeztah/carry-22033-docker-ps-format-output 
[Carry 22033] Add a check for size field in custom format string
 2016-06-05 16:39:22 -04:00
Vincent Demeester
b259558336 Merge pull request #23276 from yongtang/23211-spf13-cobra-stop 
Use spf13/cobra for docker stop
 2016-06-05 22:37:15 +02:00
Brian Goff
3f970819bb Merge pull request #23063 from yongtang/22961-aws-sdk-go 
Update aws-sdk-go to v1.1.30
 2016-06-05 16:01:52 -04:00
Brian Goff
282067e83a Merge pull request #23272 from thaJeztah/update-syntax 
Update Dockerfile highlight/syntax definitions
 2016-06-05 15:38:16 -04:00
Brian Goff
2f40b1b281 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>
 2016-06-05 15:37:15 -04:00
Brian Goff
79ff6eaf21 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>
 2016-06-05 15:37:15 -04:00
Arnaud Porterie (icecrime)
dd7e59a40a
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>
 2016-06-05 11:44:50 -07:00
Sebastiaan van Stijn
c764234c3b Merge pull request #23267 from vdemeester/migrate-export-to-cobra 
Use spf13/cobra for docker export
 2016-06-05 20:05:51 +02:00
Sebastiaan van Stijn
3cec900271 Merge pull request #23273 from vdemeester/deprecated-import-3-args 
Deprecated the old 3-args form of `docker import`
 2016-06-05 20:02:33 +02:00
Yong Tang
63d66d2796 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>
 2016-06-05 10:25:21 -07:00
Brian Goff
506e8eda40 Merge pull request #23258 from allencloud/return-err-when-volume-list-fails 
return err when volume list fails
 2016-06-05 13:24:25 -04:00
Vincent Demeester
372063ce1b
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>
 2016-06-05 18:07:34 +02:00
Brian Goff
a15bc261de Merge pull request #23271 from albers/completion-events-detach 
bash completion for detach events
 2016-06-05 11:53:01 -04:00
Sebastiaan van Stijn
4cb71f8082
Update Dockerfile highlight definitions 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-05 17:45:21 +02:00
Vincent Demeester
df1dd1322d Merge pull request #22489 from Microsoft/jjh/shell 
Builder shell configuration
 2016-06-05 17:43:12 +02:00
Harald Albers
9c9cbd2c0f bash completion for detach events 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-05 08:41:58 -07:00
Vincent Demeester
b25e64183c
Migrate export command to cobra 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-05 16:42:19 +02:00
Vincent Demeester
0f13b69fe2 Merge pull request #22988 from calavera/use_client_credentials_library 
Move native credentials lookup to the client library.
 2016-06-05 16:27:15 +02:00
David Calavera
ff3e187cc7
Use docker-credential-helpers client to talk with native creds stores. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-06-04 10:08:22 -07:00
David Calavera
feab8db60d
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>
 2016-06-04 10:06:07 -07:00
Sebastiaan van Stijn
6b4a46f282 Merge pull request #23253 from vdemeester/carry-pr-23159 
Carry #23159 : Use spf13/cobra for `docker run` and `docker create`
 2016-06-04 18:55:23 +02:00
Sebastiaan van Stijn
e556d6b667 Merge pull request #23257 from vdemeester/cobra-see-help 
Cobra - display "See 'docker cmd --help'." in error cases
 2016-06-04 18:37:14 +02:00
allencloud
ed2d300ed0 return err when volume list fails 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-06-04 23:24:14 +08:00
Vincent Demeester
6180c5c12e
Display "See 'docker cmd --help'." in error cases 
This brings back this message in case missing arguments.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-04 16:19:54 +02:00
Vincent Demeester
e975dadaa0 Merge pull request #23254 from thaJeztah/prepare-for-go-1.7 
Bump engine-api 772250a752e34cacaeef7c92b8e0ddf43450b629, prepare for go 1.7
 2016-06-04 16:07:27 +02:00
Sebastiaan van Stijn
496adadcec
Update TestHttpsInfoRogueCert for Go 1.7 
The error message changed from

  remote error: bad certificate

To

  remote error: tls: bad certificate

In Go 1.7, so just checking for "bad certificate"
to make this test work on both Go 1.6 and 1.7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-04 14:17:24 +02:00
Sebastiaan van Stijn
ed87071632
bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-04 14:16:36 +02:00
Sebastiaan van Stijn
843720257b Merge pull request #23248 from Microsoft/jjh/flakeytest 
Windows: Turn off TestBuildDockerignoreComment
 2016-06-04 14:07:52 +02:00
Daniel Nephin
5ab2434225 Convert 'docker create' to use cobra and pflag 
Return the correct status code on flag parsins errors.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-04 13:57:30 +02:00
Daniel Nephin
a77f2450c7 Convert 'docker run' to a cobra command and to use pflags 
Move container options into a struct so that tests should pass.
Remove unused FlagSet arg from Parse
Disable interspersed args on docker run

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-04 13:55:35 +02:00
Vincent Demeester
3db23a4eaf Merge pull request #23232 from thaJeztah/update-default-retries 
Healthcheck: set default retries to 3
 2016-06-04 07:50:04 +02:00