ae1be9214f
Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test
...
Use of checkers on docker_cli_config_test.go
Upstream-commit: 962243e3878ba214f65fe7a9b88462644533c333
Component: engine
2015-10-26 23:00:04 +01:00
641ecc1ebd
Merge pull request #17002 from jfrazelle/apparmor-check-version-on-deb-install
...
apparmor check version on deb install
Upstream-commit: 9312a738d84e880bf4635ba4b7729b3c2e017fbc
Component: engine
2015-10-26 22:44:11 +01:00
e73cfc9762
Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test
...
Use of checkers on docker_cli_import_test.go
Upstream-commit: 2dd822f3226393b5611364785793d38a44debd08
Component: engine
2015-10-26 13:42:02 -07:00
e1896c63ba
Merge pull request #17266 from cpuguy83/dump_http_request_on_debug
...
Dump request when daemon is set to debug
Upstream-commit: e252fe288cda563e10f70f55f934f1e05ee06729
Component: engine
2015-10-26 13:41:14 -07:00
c164ea0c2b
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
Upstream-commit: 8173acca9530dc3ff090f6025e6940e3f1f6f116
Component: engine
2015-10-26 13:33:59 -07:00
d358a1b7cc
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
Upstream-commit: 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2
Component: engine
2015-10-26 13:32:32 -07:00
e5892da983
Merge pull request #17286 from FeroVolar/namegenerator
...
Add Heyrovsky
Upstream-commit: c52fdce2f2146a478623a33982758c1c89fd1dbb
Component: engine
2015-10-26 13:26:43 -07:00
fdb9949e2c
Merge pull request #17376 from LK4D4/fix_dumper
...
Fix dumper program to use proper import
Upstream-commit: 1b9d064b73428fe64b171d38c676e4dfefea7668
Component: engine
2015-10-26 13:25:36 -07:00
37bb29c370
Merge pull request #17368 from HuKeping/update-test
...
Update docker_cli_build_unix_test
Upstream-commit: 74a881c9e4e4010d79799baec751e278864b5509
Component: engine
2015-10-26 13:21:31 -07:00
1ff12191d8
Fix dumper program to use proper import
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1477a3d7fda5e8b29d68ffd5c4d6edead9ba2c61
Component: engine
2015-10-26 13:10:01 -07:00
e58c7d88fe
Merge pull request #17180 from rhatdan/destroy
...
Docker is calling cont.Destroy twice on success
Upstream-commit: 5087e8c2e86ba61d7cec9abec00ee6bf64939d0d
Component: engine
2015-10-26 15:48:04 -04:00
da50e3fb15
Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker
...
Use checker assert for docker_cli_external_graphdriver_unix_test.go
Upstream-commit: b21f95c6125cf183fe04bcb23f40f3bffbddca54
Component: engine
2015-10-26 15:39:08 -04:00
7e73e071bd
Version exec json check.
...
Keep backwards compatibility with old versions of the api.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0b5e628e14a673cd1940876b2f3d091c2fe236d9
Component: engine
2015-10-26 15:12:06 -04:00
654728d047
GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 2046ba3e3ceee6c51f6e4c55f5d26af212d2dc3e
Component: engine
2015-10-26 19:09:00 +00:00
15bb74c0cb
Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
...
Add zsh completion for 'docker build' multi tags
Upstream-commit: 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36
Component: engine
2015-10-26 19:05:23 +01:00
07425589a1
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
Upstream-commit: 34439f3ecb5cbde2f733e162179dfbe57dbaabff
Component: engine
2015-10-26 10:06:45 -07:00
80d5075264
Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
...
Fix repeatable options in zsh completion
Upstream-commit: 7e275cf0e5e1edff77ce9b159e995e03f6ac3371
Component: engine
2015-10-26 12:43:21 -04:00
abd9d36021
Update docker_cli_build_unix_test
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f410d7e70f7196673ed63a7aa7dec25ad4475ef1
Component: engine
2015-10-26 21:06:11 +08:00
5c51a1e94a
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
Upstream-commit: 9328fc7e62e703ac5bae7de5fdf9c02dbcccb034
Component: engine
2015-10-26 13:58:21 +01:00
15e5b8010a
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es >
Upstream-commit: 7058ec278dcd27fce62c50b1e462aca8ade42439
Component: engine
2015-10-26 09:09:38 +01:00
f303148ee9
Use of checkers on docker_cli_config_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com >
Upstream-commit: d1ed5f62adadac202e34d11d513a9c7bc946ab27
Component: engine
2015-10-26 10:51:12 +08:00
d8b43fba9e
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
Upstream-commit: 75128c46c7881325c87de8797b455534558784ed
Component: engine
2015-10-25 20:39:32 -04:00
e52c395265
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ead62b59522bba132b9a14712e4350439e7fa2a5
Component: engine
2015-10-25 17:17:29 -07:00
e999854115
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
Upstream-commit: c71e97fc122d82c4bd99e47b38000d216bf360f2
Component: engine
2015-10-25 21:17:50 +01:00
b01426a7bc
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
...
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 2a5f04dcc900888ff706e36e6360d0b51d82bed1
Component: engine
2015-10-25 21:43:31 +05:30
4532f9f1f3
Merge pull request #17339 from moxiegirl/docs-readme-update
...
Tweaking some things
Upstream-commit: 5bcd6aba4b59163564187edb1c3d4fc8265da95a
Component: engine
2015-10-25 16:45:04 +01:00
107977a6ca
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
Upstream-commit: 271f85afac94b224a8e2d4dd99936bafba18a473
Component: engine
2015-10-25 11:04:27 -04:00
be6855048d
Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax
...
Update docker network inspect help syntax
Upstream-commit: c10ef20ed86befcf15b32d5081165bbd28b01c94
Component: engine
2015-10-24 21:56:38 -07:00
0fee88ca54
Tweaking some things
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 5560e8a61cd1920f915274e6cd6618d31c698247
Component: engine
2015-10-24 18:07:08 -07:00
082dcadcb4
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
...
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.
Incorporated the change as suggeted by duglin.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 6d974ec19d2f484586ec57c2e2455a6de927cddf
Component: engine
2015-10-24 22:54:24 +05:30
f5dc31b651
Add zsh completion for 'docker build' multi tags
...
+ Fix some others multi options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cc77fc3cb27c90568857c80d08787806d35aa5c8
Component: engine
2015-10-24 16:41:22 +02:00
02bb7042cb
Fix repeatable options in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 796380761007a0d0087b41b1ee0d76fd6a7a6e20
Component: engine
2015-10-24 16:38:41 +02:00
017056d464
Merge pull request #17296 from jecarey/16756-docker_cli_history_test
...
Use of checkers on docker_cli_history_test.go
Upstream-commit: 80439a4ce280777ded1b22842b7b6b3d4d6b574a
Component: engine
2015-10-24 08:14:08 -04:00
a34e3f32e2
Add splunk log driver to zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 230313b1c5cced44dd5ead776b2f62b55358222d
Component: engine
2015-10-24 13:49:27 +02:00
ca2f6a1a48
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com >
Upstream-commit: 04b6b0b47fab7751b716b0b6c8ce3b98a8c51e99
Component: engine
2015-10-23 22:32:56 -05:00
cfbc916dd7
Merge pull request #17311 from lsiqueira/patch-1
...
Update CONTRIBUTING.md
Upstream-commit: e2d263d64ee47cb79055bdcc9f903425125c50db
Component: engine
2015-10-23 19:49:29 -07:00
213dc33b1a
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: be1c77595eed1d9b22511faf64783e4c65f40c61
Component: engine
2015-10-23 19:46:28 -07:00
f937755755
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
Upstream-commit: 8d4888df90c30a189821699e444bd6587c035a20
Component: engine
2015-10-23 18:22:14 -07:00
27d55a1112
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
1489d6cd3f
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
Upstream-commit: 448398c2a8a41b6589dd7deb59fdc889e78db223
Component: engine
2015-10-23 13:50:35 -07:00
9f54d8d961
Update docker network inspect help syntax
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3dd50eaf054833280aad16e718bca4139d927532
Component: engine
2015-10-23 22:48:22 +02:00
7a1aba432f
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
4fb18756d8
Merge pull request #17306 from albers/completion-log-driver-options
...
bash completion for log driver options `env` and `labels`
Upstream-commit: a2e5bbe6409d1e639ed18ea2679b44da6bcd7332
Component: engine
2015-10-23 21:28:40 +02:00
cb862b5418
Merge pull request #17291 from aaronlehmann/buffer-compression
...
Add a buffered Writer between layer compression and layer upload
Upstream-commit: f7bdcea529c6fa07133e594ec21f036ee901122f
Component: engine
2015-10-23 13:52:08 -04:00
a4eeeb73b3
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: c2eb37f9aeb6215293483e02613514e49011cf2c
Component: engine
2015-10-24 00:59:56 +08:00
d1f77f419b
Merge pull request #17303 from coolljt0725/remove_unused_parameter
...
Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go
Upstream-commit: cd5108b1786461fbb2aecf251506e70e2683f3bc
Component: engine
2015-10-23 18:24:45 +02:00
e2e59d768e
Update CONTRIBUTING.md
...
Fix typo and update number of questions
Signed-off-by: Leandro Siqueira <leandro.siqueira@gmail.com >
Upstream-commit: e50c8f67ea6bb28c1c42fbc3258014d4077c9c93
Component: engine
2015-10-23 12:07:57 -04:00
9345ffc645
Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test
...
Using checkers assert for integration-cli/docker_cli_experimental_test.go
Upstream-commit: b972a6e3f8087ae054633c70659c3597a0e10e18
Component: engine
2015-10-23 09:44:32 -04:00
d7444aebe0
Dump request when daemon is set to debug
...
Uses a new middleware which calls httputils.DumpRequest which is output
to `logrus.Debug`.
This is implemented in a separate middleare so that we only have to
check the logging level when the router is instantiated rather than at
every request.
If this was just `logrus.Debug(httputil.DumpRequest(...))`, the
DumpRequest would be called on each request requardless of logging
level set on the daemon.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 37dbe075196d638d6bd417716deaf067247ee966
Component: engine
2015-10-23 09:04:32 -04:00
46ae794f08
bash completion for log driver options env and labels
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d0c019850c988735727723d04bfd82771fe650f8
Component: engine
2015-10-23 10:55:47 +02:00
