2d91fa1913
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
Upstream-commit: 5fd0563505108a0e2da8847b33f01065af79dda4
Component: engine
2015-07-01 13:22:03 -04:00
56e7e9d73b
Merge pull request #14134 from vdemeester/runconfig-test-coverage
...
Refactor and add tests coverage on package runconfig
Upstream-commit: be5e1498c360d80dfb42fdc1523afb2e7640996b
Component: engine
2015-07-01 10:15:26 -07:00
5607e48f25
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 88d32a6109a15633481f758c4d0689516ae58aef
Component: engine
2015-07-01 18:16:17 +02:00
64d348038a
Merge pull request #14314 from sunyuan3/TestRmiBlank
...
Add the expected error verification for TestRmiBlank.
Upstream-commit: 1d7a62d776512428e2d088d8106d60697a2f52cb
Component: engine
2015-07-01 09:09:56 -07:00
b5769ca9ef
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 2179dd00dd2e084ed833c2c22e766b56903fc12c
Component: engine
2015-07-01 19:34:43 +08:00
a2e24e4001
Refactor test and add coverage to runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d4aec5f0a680b6b01bb720830451a93c6ec398e6
Component: engine
2015-07-01 10:16:36 +02:00
afa4fd55b8
Import latest libnetwork
...
- To bring in interface which retrieves endpoint statistics
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 126b1b2923286b3baf57d7a4575863be5cf67c7a
Component: engine
2015-06-30 14:16:16 -07:00
67a917ff70
Merge pull request #14238 from rileytg/fix-graphdb-test-typo
...
fixed typo in graphdb_test failure message
Upstream-commit: bb2cd98b28249a9e98757f1a5591a9fc0ff3a2f7
Component: engine
2015-06-30 14:15:02 -07:00
5290116562
Nat was moved to pkg/nat
...
Somehow this import was missed
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: d9af8551f82aff9e4fdaed2a8d250845b12dcf53
Component: engine
2015-06-30 16:48:17 -04:00
7f87043716
Merge pull request #14294 from mavenugo/bnone
...
fixed incorrect assumption on --bridge=none treated as disable network
Upstream-commit: a2621ac6dacf87bf713ac327f7c0e14eb77e52bc
Component: engine
2015-06-30 13:40:52 -07:00
7f4872fe6c
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
Upstream-commit: caa4acc7b11cbefb74d0b066d4a0752f4a11c5ee
Component: engine
2015-06-30 13:23:30 -07:00
521162c904
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 >
Upstream-commit: c9328c6ccf120abda297d11fcfc7e60c7c31ec21
Component: engine
2015-06-30 13:04:28 -07:00
5b89db2050
Merge pull request #13962 from unclejack/shrink_docs_images
...
docs: shrink some big images
Upstream-commit: a453da21147cefefae52e95a54e427cb4b211e81
Component: engine
2015-06-30 21:55:44 +02:00
1318ab977d
Merge pull request #14231 from ankushagarwal/checkValidPort
...
Validate hostConfig on daemon. Check for invalid port specifications
Upstream-commit: 2de810df3f552c0ddfb671276db153c27c2cd37a
Component: engine
2015-06-30 15:54:24 -04:00
0d58662487
Merge pull request #12846 from dave-tucker/network_integration
...
integration-cli: Add Tests for IPv6 and Fixed CIDR
Upstream-commit: 2d8dd6b93e641a12e998f443bae3a6be2cf9a6d5
Component: engine
2015-06-30 12:52:07 -07:00
335520845a
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
Upstream-commit: f13b40f6e7678753f3414a75a6b0d175bc4d1d3f
Component: engine
2015-06-30 15:44:48 -04:00
748772ece4
Validate Port specifications on daemon side
...
Fixes #14230
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 477201a2954349bfe7ab63f73b11cd19d0f782d0
Component: engine
2015-06-30 12:14:49 -07:00
d99f89f02c
Merge pull request #14268 from unclejack/lower_allocations_execdriver
...
daemon: lower allocations
Upstream-commit: bb364ff459e8ebcc601a13057a1477336646474b
Component: engine
2015-06-30 12:12:06 -07:00
0b41c35316
Merge pull request #14211 from icecrime/roadmap
...
Add ROADMAP.md
Upstream-commit: 96417dd6c37c32b7d8a38e533bff5638762e7be4
Component: engine
2015-06-30 11:40:45 -07:00
8ec0428415
Add ROADMAP.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: aa5fb884b44af40220f47d12a779223653f5a625
Component: engine
2015-06-30 10:17:08 -07:00
9161e24479
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 >
Upstream-commit: 9c2374d19623581028f070bc93fa4c60a660dce4
Component: engine
2015-06-30 17:43:17 +01:00
e7e4c94326
Merge pull request #14267 from ankushagarwal/memory-swap-docs
...
Typo in memory-swap flag
Upstream-commit: 90024b952c744d3dca286d5a704e133accca996d
Component: engine
2015-06-30 05:48:47 -07:00
b565b94e85
daemon: lower allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: c1477db04fc32621652cf6a8fd2976b6bbf2066e
Component: engine
2015-06-30 01:45:31 +03:00
009fa2d15e
Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage
...
Add and refactor tests for pkg/parsers{,*}
Upstream-commit: 20467faf132b113a4771fe665e2ce7335de94063
Component: engine
2015-06-29 15:24:14 -07:00
f1c962082a
Merge pull request #14133 from Microsoft/10662-netmode
...
Windows: Refactor network modes
Upstream-commit: 18d5d3ba0332f95a294f09cd8c3ac9aeada0a4a5
Component: engine
2015-06-29 15:02:42 -07:00
fec4b99167
Merge pull request #14218 from calavera/fix_exec_user
...
Default process user to container config user.
Upstream-commit: 475ae0889e2d460084e6ba9bb047b8acbc87c535
Component: engine
2015-06-29 14:31:45 -07:00
bfd9d20e79
Add test coverage to pkg/parsers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b81472a6d861b335d968a1e970d9aebc314530f2
Component: engine
2015-06-29 22:30:11 +02:00
0a2b0f80c4
Windows: Refactor network modes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c5e6a4b307d93c066c07b7664ffc676708b42391
Component: engine
2015-06-29 13:13:55 -07:00
14f61357df
Typo in memory-swap flag
...
Fixes #14253
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: e7e48bcfddf8f2a28fcb79f0282afd1fc86133fb
Component: engine
2015-06-29 13:12:08 -07:00
73973301dc
Default process user to container config user.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0faa4518ed2dad592bb238838b4df2b34d2171c3
Component: engine
2015-06-29 12:52:05 -07:00
e9b5745a3f
Merge pull request #14222 from erikdw/fix-casing-of-vmware-in-main-doc
...
Use proper casing for VMware in README
Upstream-commit: 77396bd66acc141f1d5a1743cecd27777af7ef1d
Component: engine
2015-06-29 15:16:01 -04:00
75dc0ff78d
Merge pull request #14244 from ankushagarwal/patch-1
...
Update README.md
Upstream-commit: 4fd284bde00f863d4d8b4196e38eb3fb5299805b
Component: engine
2015-06-29 11:53:25 -07:00
0bc889c212
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
Upstream-commit: 0aea0e4072c403d7377ff63313196fb8fdabf9a1
Component: engine
2015-06-29 11:05:54 -07:00
a8c9aef74e
Merge pull request #14061 from runcom/clean-builder-daemon-config
...
Add struct to configure Builder commit
Upstream-commit: d543a01e17ace181261dd7809bbeec0c6580b867
Component: engine
2015-06-29 11:04:05 -07:00
7b3bea6e05
Plugins JSON spec.
...
Allow full configuration of external plugins via a JSON document.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 333ac3a3eb09c29c42fe2cea1680621700b67b2f
Component: engine
2015-06-29 10:32:18 -07:00
d3d22ab0cd
Merge pull request #14193 from stevvooe/concurrent-pull-fix
...
Attempt to protect on disk image store with mutex
Upstream-commit: cb2079e21853d04164aba13291c62ad8eeba1e15
Component: engine
2015-06-29 10:28:02 -07:00
67af392a8e
Merge pull request #14243 from moxiegirl/carry-pr-13323
...
Closes #13323 and carries
Upstream-commit: 985fd1c6cc65a29c25d061f350bb938b3c750117
Component: engine
2015-06-29 08:33:34 -07:00
184681a206
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
Upstream-commit: d612782023f550d6990e9fc76c2a9de97ab97a43
Component: engine
2015-06-29 09:46:50 -05:00
3b04e3bce0
Merge pull request #14147 from ericsage/patch-1
...
Fix Typo in experimental docs
Upstream-commit: a386a00a3cf93dd77c5e95e16233cf5231ceba65
Component: engine
2015-06-29 10:41:09 -04:00
e0f8fd3174
Merge pull request #13876 from vdemeester/pkg-jsonlog-test-coverage
...
Add test coverage to pkg/jsonlog
Upstream-commit: e1afbbf247242b84f32e5bbd29f178a8385715a9
Component: engine
2015-06-29 16:39:56 +02:00
eada1cc719
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 >
Upstream-commit: 2dfb7f3b7d66e49841cf07aa11943b74312222a3
Component: engine
2015-06-29 14:45:00 +01:00
4f74d3f3bd
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 078b23a37daf95101bf31bafc7f8396af7ad7d98
Component: engine
2015-06-29 06:18:41 -07:00
1cf7df57b2
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 >
Upstream-commit: 9bbdaa9280609c2c6fc86c6749dfb3d4869d0097
Component: engine
2015-06-29 01:10:27 -07:00
c791ee6a21
Merge pull request #14198 from cpuguy83/14170_fix_entrypoint_as_string
...
Fix unmarshalling of Command and Entrypoint
Upstream-commit: 40a41ffdf0b3901866866c5b7ef9d4e4c71bb552
Component: engine
2015-06-28 19:47:26 -06:00
972e3c452c
fixed typo in graphdb_test failure message
...
Signed-off-by: Riley Guerin <rileytg.dev@gmail.com >
Upstream-commit: c9175d681bcd2e3c4d8c3fee7cc8114731bb07a7
Component: engine
2015-06-28 16:54:05 -07:00
9e13a75360
Add test coverage to pkg/jsonlog
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e7a9a0bed84dc04db8d68dfc48fe095c5ce3edcb
Component: engine
2015-06-27 10:13:47 +02:00
5597af50f8
Use proper casing for VMware in README
...
Signed-off-by: Erik Weathers <erikdw@gmail.com >
Upstream-commit: 9030f531659ddc9ca7bfffcb708cde579973e2ae
Component: engine
2015-06-26 19:16:29 -07:00
2107a3b6a8
Add better client error for client certificate failure (missing or denied)
...
This adds a more meaningful error on the client side so the "bad
certificate" error coming from the TLS dial code has some context for
the user.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: d175ef6773708afef5982d233ad600f18cf2cdc2
Component: engine
2015-06-26 16:23:05 -07:00
6d91855b5c
Merge pull request #13740 from Microsoft/10662-securitywarning
...
Windows: Security warning based on server OS
Upstream-commit: 389b806945c5b2e621e3390b565f4f786e952d99
Component: engine
2015-06-26 13:09:03 -07:00
786eafcf79
Merge pull request #14120 from mdavranche/tempDir
...
tempDir (in the root dir), must be created after the root dir.
Upstream-commit: 2d15b35f7afaf496ecfbfd61e2c102033255386e
Component: engine
2015-06-26 11:46:55 -07:00
