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
Federico Gimenez
e8da75d4a1
Integration test: bridge ip is excluded from the allocator pool
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es >
2015-10-25 09:36:38 +01: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
Lei Jitang
79804d271c
Better log on docker load
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-24 06:33:15 -04: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
Santhosh Manohar
1041f39670
Vendor in libnetwork changes to support container rename
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-10-23 16:27:03 -07:00
Madhu Venugopal
3b16a8c91c
integration-cli test for active container rename and reuse
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-10-23 16:26:24 -07:00
Santhosh Manohar
8e0bbb2898
Add libnetwork call on daemon rename
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-10-23 16:26:24 -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
John Howard
2e56e78caf
Windows [TP4] Trap Exec Hyper-V Cont error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-23 08:42:24 -07:00
John Howard
a3c43964cf
Windows [TP4] HCSShim Revendor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-10-23 08:41:30 -07: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
Steve Durrheimer
cb93fefa40
Zsh completion for 'docker network inspect' multiple networks
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-10-23 08:13:33 +02:00
Sebastiaan van Stijn
d023d5a8a2
Merge pull request #17295 from SvenDowideit/two-more-links
...
Two more links to fix
2015-10-22 22:10:33 -07:00
Sven Dowideit
1f9332cd16
Two more links to fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-10-23 14:10:43 +10:00
Aaron Lehmann
bb69f10df9
Add a buffered Writer between layer compression and layer upload
...
Without this buffering, the compressor was outputting 64 bytes at a
time to the HTTP stream, which was resulting in absurdly small chunk
sizes and a lot of extra overhead. The buffering restores the chunk size
to 32768 bytes, which matches the behavior with 1.8.2.
Times pushing to a local registry:
1.8.2: 0m18.934s
master: 0m20.564s
master+this commit: 0m17.593s
Fixes : #17038
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-10-22 19:58:01 -07:00
Mohammed Aaqib Ansari
ff91c8ac1a
Using checkers assert for integration-cli/docker_cli_experimental_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-10-22 20:29:18 -04:00
Michael Crosby
21aecf62a0
Merge pull request #17284 from calavera/buffer_inspect_template
...
Fail when there is an error executing an inspect template.
2015-10-22 17:06:16 -07:00
Fero Volar
ac37d1f10a
Add Bassi
...
Signed-off-by: Fero Volar <alian@alian.info >
2015-10-23 01:32:47 +02:00
David Calavera
3b9c13873a
Fail when there is an error executing an inspect template.
...
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-10-22 19:24:50 -04:00
Tibor Vass
37da495d4c
Merge pull request #17278 from mavenugo/etchosts
...
Vendoring libnetwork & libkv with fixes
2015-10-22 19:02:02 -04:00
Fero Volar
685425bb2b
Add Heyrovsky
...
Signed-off-by: Fero Volar <alian@alian.info >
2015-10-23 01:01:58 +02:00
Sean OMeara
d2d40c2d9c
Documenation update - articles/chef
...
Signed-off-by: Sean OMeara <sean@chef.io >
2015-10-22 17:53:28 -04:00
Tibor Vass
4c253ddf20
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
2015-10-22 17:14:49 -04:00