David Calavera
e252fe288c
Merge pull request #17266 from cpuguy83/dump_http_request_on_debug
...
Dump request when daemon is set to debug
2015-10-26 13:41:14 -07:00
Michael Crosby
8173acca95
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
2015-10-26 13:33:59 -07:00
Michael Crosby
5cf028d3dd
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
2015-10-26 13:32:32 -07:00
David Calavera
c52fdce2f2
Merge pull request #17286 from FeroVolar/namegenerator
...
Add Heyrovsky
2015-10-26 13:26:43 -07:00
David Calavera
1b9d064b73
Merge pull request #17376 from LK4D4/fix_dumper
...
Fix dumper program to use proper import
2015-10-26 13:25:36 -07:00
Michael Crosby
74a881c9e4
Merge pull request #17368 from HuKeping/update-test
...
Update docker_cli_build_unix_test
2015-10-26 13:21:31 -07:00
Alexander Morozov
1477a3d7fd
Fix dumper program to use proper import
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-26 13:10:01 -07:00
Brian Goff
5087e8c2e8
Merge pull request #17180 from rhatdan/destroy
...
Docker is calling cont.Destroy twice on success
2015-10-26 15:48:04 -04:00
Brian Goff
b21f95c612
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
2015-10-26 15:39:08 -04:00
David Calavera
0b5e628e14
Version exec json check.
...
Keep backwards compatibility with old versions of the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-26 15:12:06 -04:00
Srini Brahmaroutu
2046ba3e3c
GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-26 19:09:00 +00:00
Sebastiaan van Stijn
74b9d89648
Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
...
Add zsh completion for 'docker build' multi tags
2015-10-26 19:05:23 +01:00
Alexander Morozov
34439f3ecb
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
2015-10-26 10:06:45 -07:00
Tibor Vass
7e275cf0e5
Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
...
Fix repeatable options in zsh completion
2015-10-26 12:43:21 -04:00
Hu Keping
f410d7e70f
Update docker_cli_build_unix_test
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 21:06:11 +08:00
Antonio Murdaca
9328fc7e62
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
2015-10-26 13:58:21 +01:00
Federico Gimenez
7058ec278d
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-26 09:09:38 +01:00
Brian Goff
75128c46c7
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
2015-10-25 20:39:32 -04:00
Madhu Venugopal
ead62b5952
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-25 17:17:29 -07:00
Vincent Demeester
c71e97fc12
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
2015-10-25 21:17:50 +01:00
Doug Davis
029e7ae4e0
Merge pull request #17348 from askb/17243_flaykytest_TestExecAfterContainerRestart
...
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
2015-10-25 13:25:21 -04:00
Anil Belur
2a5f04dcc9
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>
2015-10-25 21:43:31 +05:30
Sebastiaan van Stijn
5bcd6aba4b
Merge pull request #17339 from moxiegirl/docs-readme-update
...
Tweaking some things
2015-10-25 16:45:04 +01:00
Tibor Vass
271f85afac
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
2015-10-25 11:04:27 -04:00
moxiegirl
c10ef20ed8
Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax
...
Update docker network inspect help syntax
2015-10-24 21:56:38 -07:00
Mary Anthony
5560e8a61c
Tweaking some things
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-24 18:07:08 -07:00
Anil Belur
6d974ec19d
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>
2015-10-24 22:54:24 +05:30
Steve Durrheimer
cc77fc3cb2
Add zsh completion for 'docker build' multi tags
...
+ Fix some others multi options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:41:22 +02:00
Steve Durrheimer
7963807610
Fix repeatable options in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 16:38:41 +02:00
Brian Goff
80439a4ce2
Merge pull request #17296 from jecarey/16756-docker_cli_history_test
...
Use of checkers on docker_cli_history_test.go
2015-10-24 08:14:08 -04:00
Brian Goff
c3ea74f686
Merge pull request #17301 from sdurrheimer/zsh-completion-splunk-log-driver
...
Add splunk log driver to zsh completion
2015-10-24 08:00:12 -04:00
Steve Durrheimer
230313b1c5
Add splunk log driver to zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-24 13:49:27 +02:00
James Carey
04b6b0b47f
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-23 22:32:56 -05:00
Sebastiaan van Stijn
e2d263d64e
Merge pull request #17311 from lsiqueira/patch-1
...
Update CONTRIBUTING.md
2015-10-23 19:49:29 -07:00
Alessandro Boch
be1c77595e
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-23 19:46:28 -07:00
Sebastiaan van Stijn
8d4888df90
Merge pull request #16488 from splunk/splunk_log_driver
...
Add Splunk logging driver #16207
2015-10-23 18:22:14 -07:00
Tibor Vass
e74cf8acad
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
2015-10-23 18:43:07 -04:00
Sebastiaan van Stijn
448398c2a8
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
2015-10-23 13:50:35 -07:00
Vincent Demeester
3dd50eaf05
Update docker network inspect help syntax
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-23 22:48:22 +02:00
Denis Gladkikh
1f1dbf312d
Add Splunk logging driver #16207
...
Allow to send Splunk logs using Http Event Collector
Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-10-23 13:37:53 -07:00
Vincent Demeester
a2e5bbe640
Merge pull request #17306 from albers/completion-log-driver-options
...
bash completion for log driver options `env` and `labels`
2015-10-23 21:28:40 +02:00
Tibor Vass
f7bdcea529
Merge pull request #17291 from aaronlehmann/buffer-compression
...
Add a buffered Writer between layer compression and layer upload
2015-10-23 13:52:08 -04:00
Shijiang Wei
c2eb37f9ae
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-24 00:59:56 +08:00
Antonio Murdaca
cd5108b178
Merge pull request #17303 from coolljt0725/remove_unused_parameter
...
Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go
2015-10-23 18:24:45 +02:00
Leandro Siqueira
e50c8f67ea
Update CONTRIBUTING.md
...
Fix typo and update number of questions
Signed-off-by: Leandro Siqueira <leandro.siqueira@gmail.com>
2015-10-23 12:07:57 -04:00
Brian Goff
b972a6e3f8
Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test
...
Using checkers assert for integration-cli/docker_cli_experimental_test.go
2015-10-23 09:44:32 -04:00
Brian Goff
37dbe07519
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>
2015-10-23 09:04:32 -04:00
Harald Albers
d0c019850c
bash completion for log driver options `env` and `labels`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-23 10:55:47 +02:00
Vincent Demeester
60ea37d56f
Merge pull request #17299 from sdurrheimer/zsh-completion-network-inspect-multi
...
Zsh completion for 'docker network inspect' multiple networks
2015-10-23 10:49:02 +02:00
Lei Jitang
45a8a3796f
Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-23 03:07:06 -04:00