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
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
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
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
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
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
ab3d4ee425
Remove unused parmeter of createRootFilesystemInDriver in graph/graph.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 45a8a3796f2611b5170637fc49548ae79d063904
Component: engine
2015-10-23 03:07:06 -04:00
8a2663e8ae
Zsh completion for 'docker network inspect' multiple networks
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: cb93fefa402c57986567a2a16afe0f49a3338b82
Component: engine
2015-10-23 08:13:33 +02:00
751dcfeab7
Two more links to fix
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 1f9332cd1684841d8b9ad9b3dcaee4d641ae1689
Component: engine
2015-10-23 14:10:43 +10:00
63116716d6
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 >
Upstream-commit: bb69f10df91fe5ed044e7f0c81a118a2b666757d
Component: engine
2015-10-22 19:58:01 -07:00
71f91ad534
Using checkers assert for integration-cli/docker_cli_experimental_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: ff91c8ac1ac35c2e2d68f78d1b972c97f6484342
Component: engine
2015-10-22 20:29:18 -04:00
a78999351d
Merge pull request #17284 from calavera/buffer_inspect_template
...
Fail when there is an error executing an inspect template.
Upstream-commit: 21aecf62a0064ead695e338f5dfcf8ecab5069f4
Component: engine
2015-10-22 17:06:16 -07:00
dad1c1a473
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 >
Upstream-commit: 3b9c13873afdfe6c884e1265397d7c5cb9cd5c5c
Component: engine
2015-10-22 19:24:50 -04:00
0b6eb0de48
Merge pull request #17278 from mavenugo/etchosts
...
Vendoring libnetwork & libkv with fixes
Upstream-commit: 37da495d4cf30bebb17397dd9e103e6d3e74fe08
Component: engine
2015-10-22 19:02:02 -04:00
b4d3175bf2
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
Upstream-commit: 4c253ddf204f0c8ebc58c1aa5796c689d623e16b
Component: engine
2015-10-22 17:14:49 -04:00
9dc1141005
Add integ-test for fixed--cidr == bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b53839326621e8796fee88e376fc4ca42ed980f
Component: engine
2015-10-22 14:12:46 -07:00
c31c8acf2e
Vendoring in libkv to be aligned with libnetwork
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 793b20ba093acedfb53ea2a3344601322e97893f
Component: engine
2015-10-22 14:12:46 -07:00
58a78457b3
Vendoring in Libnetwork
...
This carries fixes for
- Internal racy /etc/hosts updates within container during SD
- Renable SD service record watch after cluster-store restarts
- Fix to allow remote IPAM driver to return no IP if the user prefers
- Fix to allow --fixed-cidr and --bip to be in same range
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 52df87ac2b83693a48efcdc7167575449f122e25
Component: engine
2015-10-22 14:12:46 -07:00
e1f1cd631a
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f664f6e4b19d4e155d78af2eacddcd941dae4fce
Component: engine
2015-10-22 23:00:59 +02:00
14cf75b797
Merge pull request #17270 from albers/completion-network-ids
...
bash completion can be configured to complete network IDs
Upstream-commit: 4816626f3e84ef6452ecfed9d79ae537273bde31
Component: engine
2015-10-22 13:37:38 -07:00
95b57bebf2
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
8c31621591
Merge pull request #17269 from tonistiigi/trust-deprecation-warning
...
Show trust variable deprecation warning only if used
Upstream-commit: 09cd98462b0b9bae38806c7615ee17dd7afd5714
Component: engine
2015-10-22 22:05:29 +02:00
553ed6afa5
Turn off service discovery when icc==false
...
- Turn off built-in service discovery on docker0 bridge
when icc is false
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 20faaaa872444b6fffbc5a6d30310a782caafe0f
Component: engine
2015-10-22 12:02:02 -07:00
da35e80d77
Show trust variable deprecation warning only if used
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: dfdee4130816cd5334330cc431d8200c1fa4e609
Component: engine
2015-10-22 11:01:30 -07:00
f7f7ce4926
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
fa8ff6ad04
bash completion can be configured to complete network IDs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 1598500df8337a1fdde7954a7b0fc5688ae2acac
Component: engine
2015-10-22 18:58:34 +02:00
5bc0dcf27f
bash completion for docker network inspect supports multiple networks
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 10e485b3860516c23bc3efa43c62dd11ee912b3e
Component: engine
2015-10-22 17:53:17 +02:00
d91b6a5ec6
Merge pull request #17259 from SvenDowideit/fix-some-errant-links
...
Fix some errant links
Upstream-commit: bb19575d40b3ec679acd2aadeea37e7bba12179c
Component: engine
2015-10-22 07:26:15 -07:00
