f2aa94a27b
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
Upstream-commit: 7cd6210a88006da21529aeccadea79c9ce720abb
Component: engine
2016-01-14 13:59:14 -05:00
082c746378
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
Upstream-commit: 73a5393bf3530815a608725fe2546121ccadbfe4
Component: engine
2016-01-14 10:58:51 -08:00
a534cbd465
Vendoring libnetwork v0.5.6
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 5347f7cd947df3e29d777274c9325c9461a1c051
Component: engine
2016-01-14 10:48:48 -08:00
49a1d12f12
Revert "Break big lock into some tiny locks"
...
This reverts commit 1326f0cba5f933674e23769de1385d3b0841e758.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f093e1273d7d030a24045d97a78fec8637f46bf8
Component: engine
2016-01-14 13:38:09 -05:00
b8b2e1e984
Vendoring libnetwork v0.5.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 4e4ba9dd3a1d488cf9d808f35904ce59911a55de
Component: engine
2016-01-14 10:34:00 -08:00
ded6ab4c78
Merge pull request #19323 from wenchma/19089-add_network_id
...
Add network ID to container inspect
Upstream-commit: 812d95cdfb78f4063b967b23911ed3ef152ad533
Component: engine
2016-01-14 09:58:24 -08:00
af7fec7cd7
Merge pull request #19226 from coolljt0725/remove_dup_check
...
Remove duplication checking for the existence of endpoint to speed up container starting
Upstream-commit: f292e90b8dcca4fabf9d6aa6d889e9fae0eca6ba
Component: engine
2016-01-14 12:24:11 -05:00
980beea08a
Merge pull request #19155 from coolljt0725/create_cwd_on_create
...
Create the working directory on container creation
Upstream-commit: a225e39667d7ddd2345326bc5cd3b1ce15fd0bad
Component: engine
2016-01-14 09:13:44 -08:00
caec173c21
Add an unsafe memory discovery store for testing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 22a81a2c588a7505fd5f900e2093c44cd51ae142
Component: engine
2016-01-14 11:58:38 -05:00
d9690fd0d0
Vendor merge structure tool.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1666707cf895e9de63aedaf744ae4923c41f73d2
Component: engine
2016-01-14 11:58:38 -05:00
8eb1087397
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dda513ef651b42fcb9625e651f664554161c0a6a
Component: engine
2016-01-14 08:44:41 -08:00
cfd7c2432a
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
Upstream-commit: 349d9700bd5e3bbf86ea2b7c0097b5f897e2fbc1
Component: engine
2016-01-14 11:40:29 -05:00
806650627f
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 9f676ade0aef66bb66a26171d6bfb27f105fa1df
Component: engine
2016-01-14 22:33:41 +08:00
8bab3a37a3
Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size
...
Don't dump request body when too large
Upstream-commit: 59231ea6d8bdff3d32140d7ab28aeb98fb93ebff
Component: engine
2016-01-14 09:06:02 -05:00
da272e0828
Merge pull request #19317 from mavenugo/epforce
...
Forced endpoint cleanup
Upstream-commit: 851c94db1bafac593cf193dd9dde26cd3d9e7f23
Component: engine
2016-01-14 14:21:30 +01:00
0f98f8e081
Update CHANGELOG.md
...
Fix "smart" dashes.
Signed-off-by: Zhuoyun Wei <wzyboy@wzyboy.org >
Upstream-commit: 11801100be9e6f5c67e13855bac984688d8f7c76
Component: engine
2016-01-14 20:24:24 +08:00
bb8be65a6c
Merge pull request #19157 from wenchma/update_build_bridges
...
Update the doc of build-bridges.md
Upstream-commit: 0ed2e26f51f6b82c1b476562c3ae4134c38b26e9
Component: engine
2016-01-14 11:10:37 +01:00
ae43fa875b
Merge pull request #19286 from aboch/ipdocs
...
Add missing documentation for static IP options
Upstream-commit: ec143968de233c9767854e4c7ba08b3629070696
Component: engine
2016-01-14 11:00:09 +01:00
84e80bd254
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 >
Upstream-commit: 5ee69eb470316eead3af20725de54d3c47a47a62
Component: engine
2016-01-14 08:17:40 +00:00
ed3f8ef029
Merge pull request #19252 from HackToday/fix-vol-resp-doc
...
Update response content for volume mounts
Upstream-commit: 63525a6dc5f7be370736ec2905d40a8c8fdf1162
Component: engine
2016-01-14 09:15:13 +01:00
cc17e2f69a
fix pidfile, pid is num use '/proc + string(pid)' can't found it
...
Signed-off-by: mingqing <limingqing@cyou-inc.com >
Upstream-commit: 6a033fa03e341f8578721045a91dcbf8015982f6
Component: engine
2016-01-14 16:03:33 +08:00
985a9b7b1d
Remove the changelog auto-generation because its hardcoded in the .spec file now.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: b916d451325fc20d754f47702af34304e983a77b
Component: engine
2016-01-14 18:50:55 +11:00
b1af9c7987
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 >
Upstream-commit: 0e8d41272c7e5979d8a3f8676c94320f6c2ff691
Component: engine
2016-01-14 07:23:04 +00:00
e5509a078a
Fix #19100 and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3d2539d39d6dd12bf3db13f4df21a997d4f7ee3b
Component: engine
2016-01-14 14:58:54 +08:00
2b7ea75ef2
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 >
Upstream-commit: b464f1d78cdfa2a4124e083b8f7b0f2353f12de3
Component: engine
2016-01-13 21:28:52 -08:00
a081c98efd
Fixing TestInspectApiContainerVolumeDriver
...
Currently the TestInspectApiContainerVolumeDriver is testing the
existence of a volume driver without specifing any volume driver.
This commit fixes that.
Signed-off-by: André Martins <aanm90@gmail.com >
Upstream-commit: 693b5c429820785d572b8a32bf0818c909a2090f
Component: engine
2016-01-14 03:22:53 +00:00
b4989a8d3c
Merge pull request #19319 from calavera/fix_tls_config_for_response_hijacking
...
Fix response hijacking with TLS enabled.
Upstream-commit: 742a7d53f2961565f0baf43d6423383101be84c3
Component: engine
2016-01-13 21:44:11 -05:00
7237c4ead6
Add test to verify that response hijacking always works over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: db1d5f7ea37c2a3b0bedc9dbcbf5bd3b32258219
Component: engine
2016-01-13 20:18:06 -05:00
680642b7a4
Vendor engine-api 0.2.2.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 7a5d8974109ec34e9fb752b2935077eb8da7a229
Component: engine
2016-01-13 20:09:47 -05:00
673b53a1a4
Sync changes for registry and notary
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: ae7d7db985ea11a5613261e2450cd6fbc3ad108f
Component: engine
2016-01-14 01:46:35 +01:00
b346420514
Merge pull request #19318 from Djelibeybi/fix-selinux-rpm-changelog
...
Not having a changelog is bad RPM etiquette.
Upstream-commit: 3720fbfb35b2f8173b47c0a381cb0bdf09ae1a20
Component: engine
2016-01-13 16:00:44 -08:00
279593a3ff
Merge pull request #19313 from tiborvass/bump-go-1.5.3
...
Bump Go to version 1.5.3
Upstream-commit: a79307c49037b036d4198812a2de83fe8fe2e450
Component: engine
2016-01-13 15:59:19 -08:00
e4291809ce
Not having a changelog is bad RPM etiquette.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 22af8dfb14d7cc9eb91964ed187a074658f57005
Component: engine
2016-01-14 10:34:48 +11:00
e45d68c9fe
Add missing documentation for static IP options
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ee14232647085ce2faf7167959728977d36e5503
Component: engine
2016-01-13 14:53:14 -08:00
7afe53c8eb
Adds cross-repository blob pushing behavior
...
Tracks source repository information for each blob in the blobsum
service, which is then used to attempt to mount blobs from another
repository when pushing instead of having to re-push blobs to the same
registry.
Signed-off-by: Brian Bland <brian.bland@docker.com >
Upstream-commit: 7289c7218e2101eb94fb90f2cb22e1412d016984
Component: engine
2016-01-13 14:26:30 -08:00
2e1c787d5f
Bump Go to version 1.5.3
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
0411e42a0a
Don't dump authz request when body is too large
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 93268d845e41be9cb67744c9bf7a82f8409dff04
Component: engine
2016-01-13 17:04:49 -05:00
b056e82903
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 >
Upstream-commit: 89af3835d483fe758f301aa8f3b1062a0ab712fb
Component: engine
2016-01-13 17:01:35 -05:00
b6d75433b3
Merge pull request #19311 from estesp/no-oom-warning-when-cant-even
...
Only warn on OOMKill disable if the feature is actually requested
Upstream-commit: 9c30492e9e5cf8da5771af87d2b0a83a627ff2b4
Component: engine
2016-01-13 13:43:37 -08:00
3587269c45
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
Upstream-commit: 661d75f39858934c230c59a68d908ef203c34136
Component: engine
2016-01-13 13:22:08 -08:00
2e91a82de6
Merge pull request #19241 from rhvgoyal/fix-device-id-free
...
Mark device ID free only if device actually got deleted
Upstream-commit: d6e01e3337a6ed1e941cf01840ee91ce55c55db4
Component: engine
2016-01-13 13:07:39 -08:00
5e9b25b836
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)
Upstream-commit: 5a707d94d605fdf2a35d5a7033d1971b49745352
Component: engine
2016-01-13 11:53:44 -08:00
3bf5cbf342
Merge pull request #19279 from tiborvass/rename-authz-to-authorization
...
Rename authz to authorization for greater clarity
Upstream-commit: 612cf0f172948c892d642af3213a012fcf292135
Component: engine
2016-01-13 14:30:18 -05:00
a7dc252abe
Merge pull request #19283 from tonistiigi/fix-permission-build-stdin
...
Avoid extracting to temp directory on building from tar
Upstream-commit: c8cc4fb8d9a8d0cd155b8d26a3108e7762b623e3
Component: engine
2016-01-13 11:17:37 -08:00
460be1e8dd
Rename authz to authorization for greater clarity
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5c630ea7c3d5e7a24e1c4b2e15506f326706e9bc
Component: engine
2016-01-13 14:15:37 -05:00
3605a0e9af
Merge pull request #19273 from calavera/volume-lazy-init
...
[Carry 18549] Lazy initialize Volume on container Mount object.
Upstream-commit: 184040bdd55c3930123ad4984dd976181b26cae8
Component: engine
2016-01-13 14:15:17 -05:00
3baefd3b5b
daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: e47112d3e812b90b240624711e7a5d2d203d6746
Component: engine
2016-01-13 13:57:31 -05:00
37e5d77def
update registry and remove notary on ppc64le
...
ppc64le now installs the second registry used for
f11b6a2ab313a03d051dd6f69d264d0482df72d6
Also, removed notary until the change to go 1.5.1+
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 7465a3149f9f0f5c996e95198c46960a4b92c9c2
Component: engine
2016-01-13 13:55:29 -05:00
82334437e0
Better warning message on OOM kill disable without mem limit
...
Modify the warning to be more readable/understandable.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 4983e5807eb86a71f88dd83791f7a9f277bc2889
Component: engine
2016-01-13 10:40:49 -08:00
1e6d6c8c64
Merge pull request #19276 from calavera/internal
...
[Carry 18926] Add network internal mode
Upstream-commit: 0ee64127ae67844918aa961f81e73185c57c21dc
Component: engine
2016-01-13 10:13:21 -08:00
