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

28699 commits

This branch
This branch
All branches
Author SHA1 Message Date
Victor Vieux
f67d4b897a Merge pull request #28184 from Microsoft/jjh/user 
Windows: Plumb through user
 2016-11-09 11:32:42 -08:00
Michael Crosby
da0ccf8e61 Merge pull request #28047 from cpuguy83/27773_chrootarchive_rbind 
Fix issue with cp to container volume dir
 2016-11-09 10:52:14 -08:00
Vincent Demeester
fe77fc5bf1 Merge pull request #28196 from allencloud/add-short-flag-for-force 
add short flag for force
 2016-11-09 18:11:58 +01:00
Sebastiaan van Stijn
01f5c52a59 Merge pull request #28163 from yongtang/11082016-help-ptr 
Remove `-ptr` from the help output of `service create`
 2016-11-09 17:53:06 +01:00
Sebastiaan van Stijn
ce142ec7a3 Merge pull request #28208 from thaJeztah/carry-27830-deprecate-no-version-in-api-urls 
[carry 27830] Deprecate API calls without a version
 2016-11-09 17:45:44 +01:00
Brian Goff
bf960a6bdc Merge pull request #28189 from Microsoft/jjh/fluentd 
Windows: Enable fluentd logdriver
 2016-11-09 11:28:37 -05:00
Ben Firshman
a5fe15072d Deprecate API calls without a version 
See #21157 for more details.

In a future version of Docker, providing a version to API calls
will be mandatory. An implementation of this is in #27801.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-09 17:04:16 +01:00
Brian Goff
5125484720 Merge pull request #28197 from sdurrheimer/zsh-completion-image-subcommand 
Add zsh completion for new 'docker image' subcommands
 2016-11-09 10:30:55 -05:00
Sebastiaan van Stijn
70b53c932d Merge pull request #28141 from darrenstahlmsft/TerminateTemplates 
Terminate template containers before delting a layer
 2016-11-09 15:44:33 +01:00
Vincent Demeester
4f7083a04f Merge pull request #27947 from milindchawre/fix_27798 
Fixes #27798 : Update help for --blkio-weight parameter
 2016-11-09 15:35:38 +01:00
Vincent Demeester
103641f5c6 Merge pull request #28201 from yuexiao-wang/test-func 
Update function name for TestCalculBlockIO
 2016-11-09 15:34:25 +01:00
Yong Tang
beafc7c7d9 Remove -ptr from the help output of service create 
This fix is based on the comment:
https://github.com/docker/docker/pull/28147#discussion_r86996347

Previously the output string of the `DurationOpt` is `duration-ptr`
and `Uint64Opt` is `uint64-ptr`. While it is clear to developers,
for a normal user `-ptr` might not be very informative.

On the other hand, the default value of `DurationOpt` and `Uint64Opt`
has already been quite informative: `none`. That means if no flag
provided, the value will be treated as none.
(like a ptr with nil as the default)

For that reason this fix removes the `-ptr`.

Also, the output in the docs of `service create` has been quite
out-of-sync with the true output. So this fix updates the docs
to have the most up-to-date help output of `service create --help`.

This fix is related to #28147.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-09 06:30:10 -08:00
Brian Goff
93e837d1d2 Merge pull request #28037 from crosbymichael/tini 
Replace grimes with tini for default init shipped in Docker
 2016-11-09 09:29:42 -05:00
Sebastiaan van Stijn
bab1b2a0a4 Merge pull request #27733 from milindchawre/fix_update_delay 
Fixes #24083 : Improving cli help for flags with duration option
 2016-11-09 15:06:05 +01:00
Justin Cormack
5020905e9d Merge pull request #27329 from dattatrayakumbhar04/26639_nfs_volume_with_hostname 
#26639: Local NFS volumes do not resolve hostnames
 2016-11-09 13:46:56 +00:00
milindchawre
ecb59a2283 Fixes #24083 : Improving cli help for flags with duration option 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-11-09 12:17:28 +00:00
Sebastiaan van Stijn
806f09bf32 Merge pull request #26088 from akirakoyasu/patch-fluent-unixsocket 
Proposal: unix-sockets support in Fluentd logging driver
 2016-11-09 12:49:06 +01:00
yuexiao-wang
5ffe496a22 Update function name for TestCalculBlockIO 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-09 17:43:10 +08:00
Vincent Demeester
c025049c27 Merge pull request #28098 from yongtang/25099-oom_score_adj-empty-env 
Fix `/proc/<pid>/oom_score_adj: invalid argument` error caused by empty env name
 2016-11-09 10:39:18 +01:00
Sebastiaan van Stijn
79c37d1483 Merge pull request #28193 from yuexiao-wang/plugin-driver 
Fix the link for plugin documentation
 2016-11-09 10:25:06 +01:00
Vincent Demeester
29a38a4fe8 Merge pull request #27997 from aaronlehmann/raft-options 
cli: Add options for Raft snapshotting
 2016-11-09 10:19:45 +01:00
Victor Vieux
2ee6032c88 Merge pull request #27311 from darrenstahlmsft/CloseStdinError 
Windows: Stop returning errors that should be ignored while closing stdin
 2016-11-09 00:17:04 -08:00
Steve Durrheimer
29367c7e68
Cleanup after moving all zsh completion logics for the new image command 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:25 +01:00
Steve Durrheimer
cc879af088
Move zsh completion logic to new subcommand: tag 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:23 +01:00
Steve Durrheimer
d2af96342d
Move zsh completion logic to new subcommand: save 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:22 +01:00
Steve Durrheimer
e5c98f3887
Move zsh completion logic to new subcommand: rm 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:20 +01:00
Steve Durrheimer
17cdc95a19
Move zsh completion logic to new subcommand: push 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:18 +01:00
Steve Durrheimer
102742a3cd
Move zsh completion logic to new subcommand: pull 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:16 +01:00
Steve Durrheimer
c333821334
Move zsh completion logic to new subcommand: ls 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:14 +01:00
Steve Durrheimer
c308befdc0
Move zsh completion logic to new subcommand: load 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:13 +01:00
Steve Durrheimer
d0014299b4
Add zsh completion logic to new subcommand: inspect 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:11 +01:00
Steve Durrheimer
a4656e46f7
Move zsh completion logic to new subcommand: import 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:10 +01:00
Steve Durrheimer
2014e78730
Move zsh completion logic to new subcommand: history 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:08 +01:00
Steve Durrheimer
d3305a17e1
Move zsh completion logic to new subcommand: build 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:07 +01:00
Steve Durrheimer
53a56990c4
Add zsh completion for 'docker image' subcommands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:15:05 +01:00
Steve Durrheimer
2a44da9732
Rename zsh images & log complete functions 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-09 08:14:40 +01:00
allencloud
955c35b6a6 add short flag for force 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-09 14:40:47 +08:00
yuexiao-wang
701021ebd8 Fix the link for plugin documentation 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-11-09 13:50:14 +08:00
John Howard
cff9679c6c Windows: Enable fluentd logdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-08 19:54:57 -08:00
John Howard
64a42d656b Merge pull request #28185 from Microsoft/jjh/concurrentaccess 
Windows: Avoid concurrent access to sysinfo
 2016-11-08 19:22:09 -08:00
Victor Vieux
d3c780bb90 Merge pull request #27745 from vieux/cli_backward_compose_api 
allow client to talk to an older server
 2016-11-08 18:27:23 -08:00
Darren Stahl
ae35c0f70e Stop returning errors that should be ignored while closing stdin 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-08 18:25:43 -08:00
John Howard
54e09aa4e2 Windows: Avoid concurrent access to sysinfo 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-08 17:52:38 -08:00
Victor Vieux
383a2f046b Merge pull request #28088 from aluzzardi/service-ps-task-resolution 
service ps: Truncate Task IDs
 2016-11-08 17:44:15 -08:00
Victor Vieux
462e57f05e Merge pull request #27567 from yongtang/24391-dns-setting 
Add custom DNS settings to service definition
 2016-11-08 17:43:00 -08:00
Victor Vieux
c3c58f83b6 Merge pull request #28171 from tonistiigi/fix-fifo-rm-warn 
Don’t warn on missing fifo
 2016-11-08 17:42:15 -08:00
John Howard
5207ff7202 Windows: Plumb through user 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-08 17:41:56 -08:00
Victor Vieux
4b63ad33ec Merge pull request #28086 from vieux/delete_rootfs_plugin 
delete plugin rootfs on `docker plugin rm`
 2016-11-08 17:03:01 -08:00
Sebastiaan van Stijn
3975d648b7 Merge pull request #27420 from Shugyousha/journaldfixes 
Small logger journald cleanup
 2016-11-09 01:35:08 +01:00
Andrea Luzzardi
d296f7a391 service ps: Truncate Task IDs 
- Refactored to move resolution code into the idresolver
- Made `ps` output more bearable by shortening service IDs in task names

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-08 16:17:15 -08:00