Commit Graph

1265 Commits

Author SHA1 Message Date
01de0478de Refactor TLS code with a new tlsconfig package
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.

The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.

On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bfed4b7cc3820ee3a74580aca55d5918bf05eef5
Component: engine
2015-06-05 12:38:38 -04:00
877de25418 Merge pull request #13640 from Microsoft/10662-implementmeminfo
Windows: Implement ReadMemInfo()
Upstream-commit: e33aeac70892b2088442fc146fb16ab59b4eb58c
Component: engine
2015-06-04 16:09:24 -07:00
10ccc11e11 Don't forget to clenaup tmpdir in TestFileSpecPlugin()
Also remove redundant code.

Signed-off-by: Zefan Li <lizefan@huawei.com>
Upstream-commit: d31224743b31b3e29ed7df0835193ff1ac4e723c
Component: engine
2015-06-04 21:26:15 +08:00
2d31933cd6 Merge pull request #13165 from ahmetalpbalkan/durations
Allow duration strings as --since/--until
Upstream-commit: f18ce101fbdf6c62a5643f826ed69a8abb843d87
Component: engine
2015-06-03 22:14:42 +02:00
84b3be115b Merge pull request #13231 from Microsoft/10662-chrootarchive
Windows: chrootarchive refactor
Upstream-commit: 521926f6c4238c8f5d26adccbe5052dad8a70245
Component: engine
2015-06-03 09:54:42 -07:00
add0a8eb5b Allow duration strings as --since/--until
Fixes #13107. This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.

Added unit tests for pkg/timeutils.GetTimestamp as well.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
2015-06-02 21:02:47 +00:00
fc9089bc0b Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
Add test coverage to pkg/jsonmessage
Upstream-commit: da255ec962e26491baceffdc230fac3561396ff8
Component: engine
2015-06-02 16:54:50 -04:00
29754ab635 Add test coverage to pkg/jsonmessage
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e6bd8c1e19f62fd3d09df37cd1712fd7e96bba89
Component: engine
2015-06-02 21:19:38 +02:00
7eb8a02dc4 Merge pull request #13607 from vieux/PrintfIfNotEmpty
do not print empty values in docker info
Upstream-commit: 814a92c5a1745879156ac9ab18569a9d1bc1b1a9
Component: engine
2015-06-02 10:52:45 -07:00
0382da62a7 Merge pull request #13630 from vdemeester/pkg-tarsum-test-coverage
Add test coverage for pkg/tarsum
Upstream-commit: d13af493f8fbd3a48b52d24b62aa4c5923053186
Component: engine
2015-06-02 11:44:42 -04:00
b10110ca89 Merge pull request #13553 from Microsoft/10662-revert908db
Windows: Undo 908db518 for Windows daemon
Upstream-commit: 8a11b40fea38c97779ec6f25dcd279ec92300b53
Component: engine
2015-06-02 10:22:39 -04:00
cdc521a53d Add test coverage for pkg/tarsum
And removing unused code.
- tarsum.go :
  NewTarSumHash could be non exported (for now)
  NewTarSumForLabel is never used, except for the tests
- fileinfosums.go:
  SortByPos is never used, except for the tests
- versionning.go:
  GetVersions is never used, expect for the tests

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 25f7d7822d2b858864b03ea5dfc534c32c67326b
Component: engine
2015-06-02 09:08:01 +02:00
25eb4c5026 Merge pull request #13611 from duglin/Issue13417a
Allow .dockerignore to ignore everything
Upstream-commit: aa8d8fdc0cfe07ce4e4976dc41a3fdb86ebcfc66
Component: engine
2015-06-01 15:59:57 -07:00
ab7b79c3a9 Merge pull request #13597 from sanketsaurav/master
Proposing Bose, Raman and Ramanujan
Upstream-commit: f358b39521db8ea2836b3df1b2cb9df41534f42a
Component: engine
2015-06-01 15:56:16 -07:00
a8436a9c51 no not print empty keys in docker info
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: c790aa36ea92799593fe4b32fc516784eb0c2c43
Component: engine
2015-06-01 15:05:20 -07:00
0cb484c394 Windows: Implement ReadMemInfo()
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 22b195f241b401da8f74ec10d3d085eddf54ffdf
Component: engine
2015-06-01 12:40:33 -07:00
1d47fe7076 Allow .dockerignore to ignore everything
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.

Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.

Closes: #13417

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 82ea6ed2bc33ac1ec2ad2bd8d4a098031dd77095
Component: engine
2015-05-30 04:16:00 -07:00
51fe79ab35 Proposing Bose, Raman and Ramanujan
Signed-off-by: Sanket Saurav <sanketsaurav@gmail.com>
Upstream-commit: a18c0b3b3c77f7e4be892e4f8b27ae5283fbf6fd
Component: engine
2015-05-30 04:14:11 +05:30
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
36c5713067 Windows: Undo 908db518 for Windows daemon
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d66ae6741851e587e881b31e4b72bbccc253e958
Component: engine
2015-05-28 12:04:09 -07: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
be175e17c8 Windows: chrootarchive refactor
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 62f648b06137a7e21b800f63ac403f7bb4d4f5b4
Component: engine
2015-05-20 08:56:42 -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