277284056b
Merge pull request #13446 from runcom/remove-PortSpecs
...
Remove PortSpecs from Config
Upstream-commit: ec167972bf15db8861eed8912b791a4aa9bb9efa
Component: engine
2015-05-29 14:31:48 -07:00
1efd411c44
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
Upstream-commit: 1680c78e630611a968b24a7064b1a1cd80614d75
Component: engine
2015-05-29 16:59:17 -04:00
03bef78b33
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
Upstream-commit: 8d726709ad1479693c3c326fd69b432799b82192
Component: engine
2015-05-29 16:57:27 -04:00
d7b3086241
Merge pull request #13589 from vdemeester/pkg-stringutils-test-coverage
...
Add test coverage for pkg/stringutils
Upstream-commit: 3b831a2f3af01727ba91fc52c31c6682eeef69b3
Component: engine
2015-05-29 13:38:12 -07:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
5058d1b5fc
Merge pull request #13255 from vdemeester/11588-pkg-pools-test-coverage
...
Add test coverage for pkg/pools (#11588 )
Upstream-commit: 04a451998f28054972d5cd4c26082c4092a9dc35
Component: engine
2015-05-29 13:36:20 -07:00
b652716d1c
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
Upstream-commit: f1fed87fc01c31114b78a6ca9f7060fc93480957
Component: engine
2015-05-29 10:21:57 -07:00
995b2ea375
Add test coverage for pkg/stringutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 6c36572e8b77bd7a4e8c1afa5be00fb4e7618c12
Component: engine
2015-05-29 15:49:29 +02:00
1f0c675929
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9aa8a590b74e5260df649c303d9b03d52cbb32bb
Component: engine
2015-05-29 15:09:35 +02:00
49406310ca
return error when failed to read http response body
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: de225b5d130f40189297e12ceb1593949ca24219
Component: engine
2015-05-29 12:52:51 +08:00
731e6df224
bug fix: close http response body no longer in use
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6c49576a860433d89b3c2d651bdca386353128cc
Component: engine
2015-05-29 12:03:40 +08:00
8d306cf8a5
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
2015-05-29 00:42:11 +02:00
9749c4b6ff
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
2015-05-28 11:09:02 -07:00
d4294d6fd6
Modified progress reader to close silently when read is complete.
...
Closes #13432
Signed-off-by: Moysés Borges <moysesb@gmail.com >
Upstream-commit: 709fa2ad876968b1f9598da1dfe64c27ae5522ec
Component: engine
2015-05-28 14:09:30 -03:00
0d8ca6abd9
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
Upstream-commit: bce3e761c0a78ca55cefa9c6d040c1bc9138c1fb
Component: engine
2015-05-23 18:44:18 -07:00
743c9dbd95
Carry #11858
...
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8324d7918b9c84c5f6508064801534dfd2155c90
Component: engine
2015-05-23 09:14:18 -07:00
89782c55eb
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
2015-05-21 20:34:17 -07:00
7811ce8b6f
Extract sockets initialization to a package.
...
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0bfbc6e78823fc2f455b01a02721f17bcbcaecff
Component: engine
2015-05-20 16:48:39 -07:00
729f4ab3fd
Windows: Archive package changes for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8228ee4b0fe05b856ca84ef8ea84ba29484d9b9c
Component: engine
2015-05-20 08:55:54 -07:00
6f37ffc9e3
Removed dead code from docker after libnetwork integration
...
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: f12f51b8b934c21621c17590f1d526377a297a0d
Component: engine
2015-05-19 22:40:55 +00:00
9fdf0d75ef
Merge pull request #13332 from LK4D4/fix_race_in_rand
...
Use goroutine-safe version of rand.Source
Upstream-commit: 322f675123681f6196dafdb6263fd34519e8ecbc
Component: engine
2015-05-19 14:20:33 -07:00
f0cacf3e79
Merge pull request #12437 from fmzhen/remove-regex-replace
...
Removal of the regex to replace ips
Upstream-commit: 92c869cd12313c8832584c1eb671577d070f8a5b
Component: engine
2015-05-19 22:59:17 +02:00
5deb9f980a
Use goroutine-safe version of rand.Source
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d8661250e71a60f053f575496d2b66d704549d6e
Component: engine
2015-05-19 12:32:40 -07:00
f077c776e0
Merge pull request #13265 from tiborvass/refactor-v1-auth
...
registry: Refactor requestfactory to use http.RoundTrippers
Upstream-commit: a16b2ab274e076b019e8af4dfb50491d69917e77
Component: engine
2015-05-19 09:57:34 -07:00
04b3252768
Add transport package to support CancelRequest
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 73823e5e56446b23ce01bb8e44a9670ab2552b0a
Component: engine
2015-05-18 23:31:42 -04:00
6da53b0de7
clean some redundant else clauses
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
2015-05-19 10:54:04 +08:00
2d7bfa2f2c
Removal of the regex to replace ips
...
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn >
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
2015-05-19 10:15:18 +08:00
843afe9ea1
adding nicer help when missing arguments ( #11858 )
...
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net >
Upstream-commit: 48231d623fb08eff9da589d6690b10a464df4ec5
Component: engine
2015-05-19 12:02:13 +10:00
a10bf833ac
requestdecorator: repurpose the package and rename to useragent
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: cf8c0d0f56021fbea7bc89e378bb937b53aeca3b
Component: engine
2015-05-18 21:51:54 -04:00
14d2347fac
registry: Refactor requestfactory to use http.RoundTrippers
...
This patch removes the need for requestFactories and decorators
by implementing http.RoundTripper transports instead.
It refactors some challenging-to-read code.
NewSession now takes an *http.Client that can already have a
custom Transport, it will add its own auth transport by wrapping
it.
The idea is that callers of http.Client should not bother
setting custom headers for every handler but instead it should
be transparent to the callers of a same context.
This patch is needed for future refactorings of registry,
namely refactoring of the v1 client code.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: a01cc3ca7729c3ce635fef7c1db837b5c6ae1028
Component: engine
2015-05-18 21:51:53 -04:00
038196ed40
Merge pull request #13219 from brahmaroutu/gccgo_compile_issue
...
fix to gccgo compilation error
Upstream-commit: 472538bee00d0c665ed43ff1a3db7531a8e28d65
Component: engine
2015-05-18 20:43:47 -04:00
34e0bf8384
Fix panic when using default-initialized FlagSet
...
Closes #13294
Signed-off-by: Sebastien Rannou <mxs@sbrk.org >
Upstream-commit: e94bab8278ed5672d75a4c1121ef4a6c3febc5b9
Component: engine
2015-05-18 11:55:38 +02:00
c1aed4887a
Fixing a Typo in plugins mime-type
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 215a5ebdb6c36f63ff4d6294f2d1b29f87b6af40
Component: engine
2015-05-16 08:49:23 -07:00
d8d52e00cc
Add tests for pkg/pools
...
Fixes #11588
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 07a75c48fd9c081219fdef4a4d46554237467fad
Component: engine
2015-05-16 10:39:24 +02:00
07c8ebe4df
Merge pull request #13222 from calavera/plugins_infra
...
Remote plugins plumbing.
Upstream-commit: 115b11ae69d107e163034a1cfa9fd4d8e33ff00f
Component: engine
2015-05-15 16:37:55 -07:00
377836e4b2
Allow to call back when a plugin is loaded.
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba3bcf053749543a1643421d7fa5f680a49ee1a8
Component: engine
2015-05-15 13:50:44 -07:00
dbb89bcdab
Remote plugins plumbing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 839d64ffb157ba170fb644a42f5096f334b7cc48
Component: engine
2015-05-15 11:04:58 -07:00
3d94b2d4e8
Merge pull request #13220 from Microsoft/10662-sysinfo
...
Windows: Refactor sysinfo for compilation
Upstream-commit: 248e5a4c8351e7dcf0db73808e3581d73e2ed135
Component: engine
2015-05-15 10:53:55 -04:00
f9e7dda027
Remove redundant log in pkg/pidfile/pidfile.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 60e5c273cfde9fac1ac09ebcc666977232115f65
Component: engine
2015-05-15 15:26:00 +08:00
5edd0d62d2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
Upstream-commit: e4855eebf229fa1ebddf254a6c32804425ae8c56
Component: engine
2015-05-14 16:49:01 -07:00
fb9d7fcfdc
Windows: Refactor sysinfo for compilation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b7ee717a10db00858c441f78f2f1a47e2a9493a1
Component: engine
2015-05-14 09:44:51 -07:00
a587ee906f
fix to gccgo compilation error
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: d2a2c974d9d0862ddd9974c861c080159a53cd4b
Component: engine
2015-05-14 16:28:23 +00:00
c16c9cc586
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 999f464feb5b78e8ecc97625e70f3b1796d0a758
Component: engine
2015-05-14 07:44:42 +00:00
cd070e7fe0
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
Upstream-commit: 64ea54c0ed3f0daff40402259e3a2566a51cd4fe
Component: engine
2015-05-13 15:24:01 -07:00
5de033afb0
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: cb08c1173fae541742af3c8329e00904edef48df
Component: engine
2015-05-13 21:48:48 +03:00
4627e314ec
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c6dad07b1bc585f98439dd87deadec062188cbb5
Component: engine
2015-05-13 11:04:07 +08:00
9c4dfe4f27
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
Upstream-commit: ec4baad9549448f409af5ec98fa0737b94512824
Component: engine
2015-05-12 20:28:18 -04:00
c55bc07730
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
Upstream-commit: df89008f0ce17a1ffdbde6a59ef0eade0e885ed8
Component: engine
2015-05-12 16:07:43 -07:00
aeecef0f70
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 6b700bdacae0b416d8239a0a24729fe327d425d1
Component: engine
2015-05-13 00:09:41 +02:00
00f07a55d3
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7ae2a372d6d845040cdf40b246f4eec62512398
Component: engine
2015-05-12 14:41:02 -07:00
