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
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
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
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
976823bb04
Fix some errant links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 9ed6cec8ff91ff100c268fa21817fdc111e77e43
Component: engine
2015-10-22 20:33:24 +10:00
a97ff526a8
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
Upstream-commit: 48fe12af0c785d62ac852ea8428a9789a4e9d7fd
Component: engine
2015-10-22 08:34:50 +02:00
5c1cc8ba8e
Merge pull request #17241 from gondor/docs-extend-plugins
...
docs: Add Netshare volume plugin to extend/plugins
Upstream-commit: c6ec33ea8f8a2691c9a43f02cc69fcd204e04b18
Component: engine
2015-10-21 19:24:32 -07:00
ce2218086c
changes from review - which -> that
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: a263709a9bce010082399fc539c385de3a059dda
Component: engine
2015-10-21 18:42:17 -07:00
bfa5462401
changes from review - move up to conform to alphabetical order
...
Signed-off-by: Jeremy Unruh <jeremybunruh@gmail.com >
Upstream-commit: f8c0d4d0550836eaba0b41df560464f048c5fdfd
Component: engine
2015-10-21 18:07:55 -07:00
04eb439359
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 710817a71b40287acc546fe2e08367b2a02dae54
Component: engine
2015-10-22 15:53:17 +08:00
3a9331408c
Merge pull request #17153 from albers/completion-cp-args
...
[Fix 17029] docker cp completion not correct
Upstream-commit: 4786ac1ffe53c2229deb5fc14f1261fd33004afb
Component: engine
2015-10-21 14:58:11 -07:00
807b4a5c28
Merge pull request #17203 from hopkings2008/auth_token
...
In NewV2Repository, check the suffix of endpoint.URL and append 'v2' …
Upstream-commit: 697d4c9e7222a10995f46e6008137099da778402
Component: engine
2015-10-21 14:57:05 -07:00
03db45396b
Merge pull request #17055 from daehyeok/parse_utf8
...
ProcessWord support UTF-8
Upstream-commit: ab22fe0f7ce0c6211396030431506c64e1a5d57f
Component: engine
2015-10-21 23:42:50 +02:00
389b888060
Merge pull request #17144 from thaJeztah/fix-16668-update-fish-completions-dest
...
RPM change install location of Fish completions
Upstream-commit: af6743a6c61b3c854d647975bca3f826ec654b20
Component: engine
2015-10-21 14:36:50 -07:00
9c590c0edb
Merge pull request #17227 from aaronlehmann/layer-compression
...
Fix layer compression regression
Upstream-commit: e319b122d34b88c8c450225b23515751f4d58d1b
Component: engine
2015-10-21 17:32:58 -04:00
dc90c0567e
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
Upstream-commit: bf8ba3d0c970c53890924bd1bf65cb593329df6f
Component: engine
2015-10-21 14:01:59 -07:00
