Commit Graph

21321 Commits

Author SHA1 Message Date
John Howard
08fe0a18f8 Windows: Update makefile
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-15 11:45:13 -08:00
David Calavera
d299bbfcc6 Merge pull request #19342 from Microsoft/jjh/fix19316
Windows: Fix test regression from 19155
2016-01-14 13:05:47 -08:00
David Calavera
db2b5e647c Merge pull request #19338 from aboch/vnd
Vendoring libnetwork v0.5.5
2016-01-14 13:02:20 -08:00
Jess Frazelle
7a44265129 Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
Remove the changelog auto-generation
2016-01-14 12:47:32 -08:00
John Howard
d3392a3bde Windows: Fix test regression from 19155
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:00:27 -08:00
Arnaud Porterie
3ce3fb7417 Merge pull request #19333 from wzyboy/patch-1
Update CHANGELOG.md
2016-01-14 11:21:32 -08:00
Brian Goff
7cd6210a88 Merge pull request #19326 from HackToday/19153-filter-rethink
Fix image filter
2016-01-14 13:59:14 -05:00
David Calavera
73a5393bf3 Merge pull request #19242 from mavenugo/nsalias
Network scoped alias support
2016-01-14 10:58:51 -08:00
Alessandro Boch
4e4ba9dd3a Vendoring libnetwork v0.5.5
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-14 10:34:00 -08:00
David Calavera
812d95cdfb Merge pull request #19323 from wenchma/19089-add_network_id
Add network ID to container inspect
2016-01-14 09:58:24 -08:00
Tibor Vass
f292e90b8d Merge pull request #19226 from coolljt0725/remove_dup_check
Remove duplication checking for the existence of endpoint to speed up container starting
2016-01-14 12:24:11 -05:00
David Calavera
a225e39667 Merge pull request #19155 from coolljt0725/create_cwd_on_create
Create the working directory on container creation
2016-01-14 09:13:44 -08:00
Madhu Venugopal
dda513ef65 Network scoped alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
Tibor Vass
349d9700bd Merge pull request #19291 from coolljt0725/fix_19100
Fix #19100 and fix a typo
2016-01-14 11:40:29 -05:00
Wen Cheng Ma
9f676ade0a Add network ID to container inspect
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-14 22:33:41 +08:00
Tibor Vass
59231ea6d8 Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size
Don't dump request body when too large
2016-01-14 09:06:02 -05:00
Vincent Demeester
851c94db1b Merge pull request #19317 from mavenugo/epforce
Forced endpoint cleanup
2016-01-14 14:21:30 +01:00
Zhuoyun Wei
11801100be Update CHANGELOG.md
Fix "smart" dashes.

Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org>
2016-01-14 20:24:24 +08:00
Vincent Demeester
0ed2e26f51 Merge pull request #19157 from wenchma/update_build_bridges
Update the doc of build-bridges.md
2016-01-14 11:10:37 +01:00
Vincent Demeester
ec143968de Merge pull request #19286 from aboch/ipdocs
Add missing documentation for static IP options
2016-01-14 11:00:09 +01:00
Kai Qiang Wu(Kennan)
5ee69eb470 Fix image filter
This is related image fix for Propose #19153
for volume related change, would use another patch
to fix that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-14 08:17:40 +00:00
Vincent Demeester
63525a6dc5 Merge pull request #19252 from HackToday/fix-vol-resp-doc
Update response content for volume mounts
2016-01-14 09:15:13 +01:00
Avi Miller
b916d45132 Remove the changelog auto-generation because its hardcoded in the .spec file now.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-14 18:50:55 +11:00
Sebastiaan van Stijn
d62466bd33 Merge pull request #19322 from HackToday/fixlxc
Remove wrong lxc support
2016-01-13 23:45:43 -08:00
Kai Qiang Wu(Kennan)
0e8d41272c Remove wrong lxc support
Docker master branch not support lxc, so it seems not proper to
say that anymore.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-01-14 07:23:04 +00:00
Lei Jitang
3d2539d39d Fix #19100 and fix a typo
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-14 14:58:54 +08:00
Madhu Venugopal
b464f1d78c Forced endpoint cleanup
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-13 21:28:52 -08:00
Brian Goff
742a7d53f2 Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking
Fix response hijacking with TLS enabled.
2016-01-13 21:44:11 -05:00
David Calavera
db1d5f7ea3 Add test to verify that response hijacking always works over TLS.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:18:06 -05:00
David Calavera
7a5d897410 Vendor engine-api 0.2.2.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-13 20:09:47 -05:00
Jess Frazelle
3720fbfb35 Merge pull request #19318 from Djelibeybi/fix-selinux-rpm-changelog
Not having a changelog is bad RPM etiquette.
2016-01-13 16:00:44 -08:00
Jess Frazelle
a79307c490 Merge pull request #19313 from tiborvass/bump-go-1.5.3
Bump Go to version 1.5.3
2016-01-13 15:59:19 -08:00
Avi Miller
22af8dfb14 Not having a changelog is bad RPM etiquette.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-14 10:34:48 +11:00
Alessandro Boch
ee14232647 Add missing documentation for static IP options
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-13 14:53:14 -08:00
Tibor Vass
9560d94114 Bump Go to version 1.5.3
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 17:23:46 -05:00
Brian Goff
93268d845e Don't dump authz request when body is too large
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-13 17:04:49 -05:00
Brian Goff
89af3835d4 Don't dump request body to log when too large
Fixes an issue where a client can send a large body but specifiy
application/json as the content-type, and cause Docker to consume lots
of RAM while trying to buffer the body so it can be dumped to the debug
log.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-13 17:01:35 -05:00
David Calavera
9c30492e9e Merge pull request #19311 from estesp/no-oom-warning-when-cant-even
Only warn on OOMKill disable if the feature is actually requested
2016-01-13 13:43:37 -08:00
Sebastiaan van Stijn
661d75f398 Merge pull request #19123 from shishir-a412ed/rootfs_size_configurable
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
2016-01-13 13:22:08 -08:00
David Calavera
d6e01e3337 Merge pull request #19241 from rhvgoyal/fix-device-id-free
Mark device ID free only if device actually got deleted
2016-01-13 13:07:39 -08:00
Phil Estes
5a707d94d6 Only warn on OOMKill disable if the feature is actually requested
Instead of warning the caller who is disabling OOM killer that the
feature isn't available, only warn if they are trying to **enable** OOM
killer and it can't be done.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-01-13 11:53:44 -08:00
Tibor Vass
612cf0f172 Merge pull request #19279 from tiborvass/rename-authz-to-authorization
Rename authz to authorization for greater clarity
2016-01-13 14:30:18 -05:00
David Calavera
c8cc4fb8d9 Merge pull request #19283 from tonistiigi/fix-permission-build-stdin
Avoid extracting to temp directory on building from tar
2016-01-13 11:17:37 -08:00
Tibor Vass
5c630ea7c3 Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-13 14:15:37 -05:00
Brian Goff
184040bdd5 Merge pull request #19273 from calavera/volume-lazy-init
[Carry 18549] Lazy initialize Volume on container Mount object.
2016-01-13 14:15:17 -05:00
Shishir Mahajan
e47112d3e8 daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2016-01-13 13:57:31 -05:00
David Calavera
0ee64127ae Merge pull request #19276 from calavera/internal
[Carry 18926] Add network internal mode
2016-01-13 10:13:21 -08:00
Alexander Morozov
7ea65da7ef Merge pull request #19254 from aboch/v6b
Account docker0 IPv6 address on daemon start
2016-01-13 09:48:41 -08:00
Alexander Morozov
ba15b6f049 Merge pull request #19294 from runcom/fix-check-test
integration-cli: check nil before Close'ing
2016-01-13 09:28:54 -08:00
Jess Frazelle
22f4dad3d7 Merge pull request #19287 from tianon/check-config-assoc-array
Update check-config.sh to use "case" instead of an associative array
2016-01-13 08:38:10 -08:00