David Calavera
1d7a62d776
Merge pull request #14314 from sunyuan3/TestRmiBlank
...
Add the expected error verification for TestRmiBlank.
2015-07-01 09:09:56 -07:00
David Calavera
d02540a44a
Merge pull request #14305 from aboch/nwst
...
Import latest libnetwork
2015-07-01 09:07:40 -07:00
Matthieu Hauglustaine
0dadf11bec
Add unit tests for ParseEnvFile.
...
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:43:03 +02:00
Matthieu Hauglustaine
e848494017
Return bufio error if set in ParseEnvFile
...
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.
Fixes : #14266
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:17:48 +02:00
Yuan Sun
2179dd00dd
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-01 19:34:43 +08:00
Vincent Demeester
d4aec5f0a6
Refactor test and add coverage to runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-01 10:16:36 +02:00
Quentin Tayssier
82b444e3fa
Fixing Wheezy link
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
2015-07-01 13:01:00 +09:00
Alessandro Boch
126b1b2923
Import latest libnetwork
...
- To bring in interface which retrieves endpoint statistics
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-06-30 14:16:16 -07:00
David Calavera
bb2cd98b28
Merge pull request #14238 from rileytg/fix-graphdb-test-typo
...
fixed typo in graphdb_test failure message
2015-06-30 14:15:02 -07:00
Alexander Morozov
27af9a52a1
Merge pull request #14303 from cpuguy83/fix_nat_import
...
Nat was moved to pkg/nat
2015-06-30 13:56:11 -07:00
Brian Goff
d9af8551f8
Nat was moved to pkg/nat
...
Somehow this import was missed
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-30 16:48:17 -04:00
David Calavera
a2621ac6da
Merge pull request #14294 from mavenugo/bnone
...
fixed incorrect assumption on --bridge=none treated as disable network
2015-06-30 13:40:52 -07:00
Alexander Morozov
caa4acc7b1
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
2015-06-30 13:23:30 -07:00
Madhu Venugopal
c9328c6ccf
fixed incorrect assumption on --bridge=none treated as disable network
...
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-30 13:04:28 -07:00
Sebastiaan van Stijn
a453da2114
Merge pull request #13962 from unclejack/shrink_docs_images
...
docs: shrink some big images
2015-06-30 21:55:44 +02:00
Brian Goff
2de810df3f
Merge pull request #14231 from ankushagarwal/checkValidPort
...
Validate hostConfig on daemon. Check for invalid port specifications
2015-06-30 15:54:24 -04:00
Arnaud Porterie
2d8dd6b93e
Merge pull request #12846 from dave-tucker/network_integration
...
integration-cli: Add Tests for IPv6 and Fixed CIDR
2015-06-30 12:52:07 -07:00
Brian Goff
f13b40f6e7
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
2015-06-30 15:44:48 -04:00
Ankush Agarwal
477201a295
Validate Port specifications on daemon side
...
Fixes #14230
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-30 12:14:49 -07:00
Alexander Morozov
bb364ff459
Merge pull request #14268 from unclejack/lower_allocations_execdriver
...
daemon: lower allocations
2015-06-30 12:12:06 -07:00
David Calavera
96417dd6c3
Merge pull request #14211 from icecrime/roadmap
...
Add ROADMAP.md
2015-06-30 11:40:45 -07:00
Lennie
d6da3736d7
Fix for broken link
...
The link pointed to experimental.md, but that didn't exist. It looks like README.md was intended. Probably experimental.md was renamed.
Signed-off-by: Leen Besselink <github@consolejunkie.net >
2015-06-30 20:10:12 +02:00
Arnaud Porterie
aa5fb884b4
Add ROADMAP.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-30 10:17:08 -07:00
Peter Waller
9c2374d196
Move /nat to /pkg/nat
...
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.
/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.
This rename was performed with:
```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
-from github.com/docker/docker/nat \
-to github.com/docker/docker/pkg/nat
```
Signed-off-by: Peter Waller <p@pwaller.net >
2015-06-30 17:43:17 +01:00
moxiegirl
90024b952c
Merge pull request #14267 from ankushagarwal/memory-swap-docs
...
Typo in memory-swap flag
2015-06-30 05:48:47 -07:00
unclejack
c1477db04f
daemon: lower allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-06-30 01:45:31 +03:00
Alexander Morozov
20467faf13
Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage
...
Add and refactor tests for pkg/parsers{,*}
2015-06-29 15:24:14 -07:00
David Calavera
18d5d3ba03
Merge pull request #14133 from Microsoft/10662-netmode
...
Windows: Refactor network modes
2015-06-29 15:02:42 -07:00
Alexander Morozov
475ae0889e
Merge pull request #14218 from calavera/fix_exec_user
...
Default process user to container config user.
2015-06-29 14:31:45 -07:00
Vincent Demeester
b81472a6d8
Add test coverage to pkg/parsers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-29 22:30:11 +02:00
John Howard
c5e6a4b307
Windows: Refactor network modes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-29 13:13:55 -07:00
Ankush Agarwal
e7e48bcfdd
Typo in memory-swap flag
...
Fixes #14253
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-29 13:12:08 -07:00
David Calavera
0faa4518ed
Default process user to container config user.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-29 12:52:05 -07:00
James Turnbull
77396bd66a
Merge pull request #14222 from erikdw/fix-casing-of-vmware-in-main-doc
...
Use proper casing for VMware in README
2015-06-29 15:16:01 -04:00
moxiegirl
4fd284bde0
Merge pull request #14244 from ankushagarwal/patch-1
...
Update README.md
2015-06-29 11:53:25 -07:00
Fred Lifton
0aea0e4072
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
2015-06-29 11:05:54 -07:00
David Calavera
d543a01e17
Merge pull request #14061 from runcom/clean-builder-daemon-config
...
Add struct to configure Builder commit
2015-06-29 11:04:05 -07:00
David Calavera
333ac3a3eb
Plugins JSON spec.
...
Allow full configuration of external plugins via a JSON document.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-29 10:32:18 -07:00
Alexander Morozov
cb2079e218
Merge pull request #14193 from stevvooe/concurrent-pull-fix
...
Attempt to protect on disk image store with mutex
2015-06-29 10:28:02 -07:00
moxiegirl
985fd1c6cc
Merge pull request #14243 from moxiegirl/carry-pr-13323
...
Closes #13323 and carries
2015-06-29 08:33:34 -07:00
Jeremy Price
d612782023
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
2015-06-29 09:46:50 -05:00
Phil Estes
a386a00a3c
Merge pull request #14147 from ericsage/patch-1
...
Fix Typo in experimental docs
2015-06-29 10:41:09 -04:00
Antonio Murdaca
e1afbbf247
Merge pull request #13876 from vdemeester/pkg-jsonlog-test-coverage
...
Add test coverage to pkg/jsonlog
2015-06-29 16:39:56 +02:00
Dave Tucker
2dfb7f3b7d
integration-cli: Add Tests for IPv6 and Fixed CIDR
...
This patch adds tests for the `--ipv6` and `--fixed-cidr` daemon flags
Signed-off-by: Dave Tucker <dt@docker.com >
2015-06-29 14:45:00 +01:00
Mary Anthony
078b23a37d
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-29 06:18:41 -07:00
Eric Windisch
37846bff58
Remove RC4 from the list of registry cipher suites
...
The registry client's TLS configuration used the
default cipher list, including RC4. This change
copies the default cipher list from Golang 1.4 and
removes RC4 from that list. RC4 ciphers are considered
weak and vulnerable to a number of attacks.
Uses the tlsconfig package to define allowed ciphers.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-06-29 09:15:13 -04:00
Ankush Agarwal
9bbdaa9280
Update README.md
...
cgroups and namespaces links are broken. They point to blog.dotcloud.com which is dead. Updating the links to point to informative pages.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-29 01:10:27 -07:00
Doug Davis
40a41ffdf0
Merge pull request #14198 from cpuguy83/14170_fix_entrypoint_as_string
...
Fix unmarshalling of Command and Entrypoint
2015-06-28 19:47:26 -06:00
Riley Guerin
c9175d681b
fixed typo in graphdb_test failure message
...
Signed-off-by: Riley Guerin <rileytg.dev@gmail.com >
2015-06-28 16:54:05 -07:00
Vincent Demeester
e7a9a0bed8
Add test coverage to pkg/jsonlog
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-27 10:13:47 +02:00