14b70450aa
Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
...
Use timeouts instead of relying on runtime.GoSched
Upstream-commit: 2337db8205f72b190f46a73dd28a25cee0f968f9
Component: engine
2015-11-11 18:46:52 -08:00
c0a993088d
Use timeouts instead of relying on runtime.GoSched
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: fd672d59269d100acbb36abef4e4eddc1d30bdc7
Component: engine
2015-11-11 20:59:07 -05:00
bc3ac4cb1c
Merge pull request #17919 from Microsoft/jjh/tp4
...
Windows [TP4] Require build 10586+
Upstream-commit: 87de5fdd5972343a11847922e0f41d9898b5cff7
Component: engine
2015-11-11 19:36:13 -05:00
53e497ffae
Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
...
Windows [TP4] Fix docker cp when volumes
Upstream-commit: 5b046c71d8ab944ad88baf9f92ae6b3b78a28cdd
Component: engine
2015-11-11 19:35:05 -05:00
6b208d3136
Fix find and replace typo in dockerimages
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a4b2de674c7030e70f671d5d6dcedb0c7ca5b0cd
Component: engine
2015-11-12 00:52:31 +01:00
c7dd3d34fc
Merge pull request #17918 from anusha-ragunathan/fsMagic
...
Include xfsprogs in build environment.
Upstream-commit: b664a8825ea20a729f14a49dcc0fc51ca4e01d8b
Component: engine
2015-11-11 15:43:52 -08:00
a3794d804f
Windows [TP4] Require build 10586+
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 122568b31465127537197cf6d9575b00bdd02045
Component: engine
2015-11-11 14:49:14 -08:00
83fc2cf8e7
Include xfsprogs in build environment.
...
devmapper uses xfs by default now. So include xfsprogs in build
environment. Also update docs to reflect the new default.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 2b766a455cc01f3fd51be886c9e61c0b6a5fdeb1
Component: engine
2015-11-11 14:42:08 -08:00
049a764149
Merge pull request #17913 from clnperez/oom-test-requires
...
Add the memoryLimitSupport requirement to Events OOM tests
Upstream-commit: 9d4e2f3992553b660d690093a0a294d1633b7dc6
Component: engine
2015-11-11 23:24:10 +01:00
470099dd9c
Merge pull request #17894 from mqliang/deferMove
...
move defer statement for readability
Upstream-commit: 6c82fba2b32781e6cef4fda71e7b35c3dcdcb9da
Component: engine
2015-11-11 14:03:48 -08:00
d8d32d2bbf
Windows [TP4] Fix docker cp when volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3a852d8442f31651f0e776430432e5dda44455e0
Component: engine
2015-11-11 14:02:07 -08:00
7a892cd97a
Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
...
Devicemapper: Default to xfs instead of ext4
Upstream-commit: adb14543fd2a550a3b9a8cb12637e376cd398be4
Component: engine
2015-11-11 16:42:58 -05:00
60cb2034d2
Merge pull request #17883 from dave-tucker/bug/17709
...
Add required ports for Overlay to docs
Upstream-commit: 6c5395360fd9687fcd5962eb2b1c4fe0a7a2cabe
Component: engine
2015-11-11 13:10:22 -08:00
06bdd98fbf
Merge pull request #17915 from moxiegirl/17764-fix
...
Adding in Contiv plugins
Upstream-commit: e49e6b7bfdf0e731aa0e846d1c29ab9d96a2a1d9
Component: engine
2015-11-11 20:56:57 +00:00
89f92046ef
Adding in Contiv plugins
...
Fixes #17764
Also fixed problem where the menu ordering was off
Fix the wrap
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 40fc3a8bcf39e52e45c2aac3808987a5499094d8
Component: engine
2015-11-11 12:56:07 -08:00
5521134e65
Updates to Get started with multi-host networking
...
Updates primarily to expand usage of Swarm cluster and make Compose
section more verbose plus other minor corrections.
Signed-off-by: David Currie <david_currie@uk.ibm.com >
Upstream-commit: f16dceb63233bd2c1fd327b92d7112e8012347ac
Component: engine
2015-11-11 20:31:18 +00:00
940947b2d3
Merge pull request #17909 from LK4D4/info_simple
...
daemon/info.go: assign proxy fields directly
Upstream-commit: 37dfae3cde79966734c72a57ed2b2d4c653d61b6
Component: engine
2015-11-11 21:15:13 +01:00
5c10a00d00
Merge pull request #17807 from albers/completion-network-yes
...
Align configuration of bash completion with existing values
Upstream-commit: ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e
Component: engine
2015-11-11 20:01:27 +00:00
724166c497
daemon/info.go: assign proxy fields directly
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 1df0bb5a1309af0402d83061d4404afe7396e657
Component: engine
2015-11-11 11:03:53 -08:00
202ace0de5
Merge pull request #17858 from sanimej/libn
...
Allow port mapping only for endpoint created on docker run
Upstream-commit: 0b566566c66832ea7d78b6468fb960dd2d4975f9
Component: engine
2015-11-11 11:00:31 -08:00
82cddf7c00
Merge pull request #17193 from cpuguy83/refactor_store_errors
...
Refactor volume store's error usage
Upstream-commit: 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930
Component: engine
2015-11-11 10:25:00 -08:00
f5f4be1acc
Add required ports for Overlay to docs
...
Fixes #17709
Signed-off-by: Dave Tucker <dt@docker.com >
Upstream-commit: 44a527d877faf0ef62bc9b0221f656041833ae66
Component: engine
2015-11-11 18:04:07 +00:00
4fe87618a6
Merge pull request #17890 from aboch/b6
...
Restore deterministic IPv6 from MAC behavior on default bridge network
Upstream-commit: 7a985cfafc211c8cc302e4c1e14059fc513663ba
Component: engine
2015-11-11 12:42:08 -05:00
abd797dbbd
devmapper: Switch to xfs as default filesystem if supported
...
If platform supports xfs filesystem then use xfs as default filesystem
for container rootfs instead of ext4. Reason being that ext4 is pre-allcating
lot of metadata (around 1.8GB on 100G thin volume) and that can take long
enough on AWS storage that systemd times out and docker fails to start.
If one disables pre-allocation of ext4 metadata, then it will be allocated
when containers are mounted and we will have multiple copies of metadata
per container. For a 100G thin device, it was around 1.5GB of metadata
per container.
ext4 has an optimization to skip zeroing if discards are issued and
underlying device guarantees that zero will be returned when discarded
blocks are read back. devicemapper thin devices don't offer that guarantee
so ext4 optimization does not kick in. In fact given discards are optional
and can be dropped on the floor if need be, it looks like it might not be
possible to guarantee that all the blocks got discarded and if read back
zero will be returned.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 07ff17fb850e5ddae6f38cc21776ebb9b1690f3e
Component: engine
2015-11-11 12:07:35 -05:00
edb4695814
devmapper: Warn if user specified a filesytem and base device already has fs
...
If user wants to use a filesystem it can be specified using dm.fs=<filesystem>
option. It is possible that docker already had base image and a filesystem
on that. Later if user wants to change file system using dm.fs= option
and restarts docker, that's not possible. Warn user about it.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 83a34e000b2332d9a1b4214a77fae021ed144acb
Component: engine
2015-11-11 12:07:35 -05:00
621ef05af0
Restore IPv6 from MAC on default bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 095a8ac5451de25a91fc569a6633fdd8d4cabb3f
Component: engine
2015-11-11 08:36:04 -08:00
f6690c74eb
Merge pull request #17880 from duglin/TweakMap
...
convert map value from struct to bool
Upstream-commit: 2a7b5f66574f626610f6bfcca86c15263f57c3cc
Component: engine
2015-11-11 13:49:50 +01:00
70a998c8d8
Merge pull request #17800 from Starefossen/patch-1
...
Utillize build cache for Node.js web app example
Upstream-commit: 9498e9b732234e103c41be0c91d64c46057e6fe0
Component: engine
2015-11-11 09:56:40 +00:00
9b1a025ea6
Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
...
Test to ensure that the bridge ip is excluded from the allocator pool
Upstream-commit: d6856db128212020e7d21f5121b3f0b4778910cb
Component: engine
2015-11-11 10:42:13 +01:00
199c5fdeef
Merge pull request #16774 from tonistiigi/15643-aufs-plnk
...
Copy aufs hardlinks to top layer
Upstream-commit: 10667253951a783785d3236192428a5decca3fef
Component: engine
2015-11-11 07:59:41 +01:00
789bc1f38f
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 43b3b6ecb4f838023478c484d32957386b7dd666
Component: engine
2015-11-10 21:13:25 -08:00
320a0d9081
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
Upstream-commit: 09980ef7ac2510cc67e160657f0829a47f5b5b28
Component: engine
2015-11-10 23:38:33 -05:00
7aea45d5d0
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: d71eeb1c057cdb7ffdb0b5a2aac537671578b676
Component: engine
2015-11-11 11:28:23 +08:00
cb403bcf07
Refactor volume store's error usage
...
Uses an errors API similar the `net` package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 43012fe8425650930a21703d9468ab0e777e053a
Component: engine
2015-11-10 20:33:29 -05:00
5a581803a8
Add the memoryLimitSupport requirement to OOM tests
...
The docker run commands in these tests uses the -m flag,
so the tests should require that it's supported to run.
Fixes 17215 (maybe)
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: e86b79fcccb23040feea079652fd9a7bf3458f1d
Component: engine
2015-11-10 18:06:13 -06:00
e7a1b04a89
Merge pull request #17881 from aaronlehmann/import-logging
...
Correct import event logging
Upstream-commit: 69f73252e96ad4c70023783b4a4f575e5457562e
Component: engine
2015-11-10 15:48:02 -08:00
4b9316bfc9
Merge pull request #17875 from tonistiigi/17827-builder-root-source
...
Add test for builder cache with root source path
Upstream-commit: 75c0cc2f10e322ad95c801820254b5cf9423cffd
Component: engine
2015-11-11 00:20:25 +01:00
4c3f3f1ca9
Removing made up word
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2d87dd5c6e5fd67020311dd5743dbb718d4a75e9
Component: engine
2015-11-10 14:37:23 -08:00
0787af9472
Utillize build cache for Node.js web app example
...
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com >
Upstream-commit: 641c739fc1352aab8937ea8f0280082fa8e67ff8
Component: engine
2015-11-10 23:05:32 +01:00
e88dbeb2b2
Correct import event logging
...
Importing an image currently logs an event with id:tag. This format is
strange and nonstandard - possibly a mistake. Just log the ID instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 77cd22ea73f83491d0e7e0fd084b6c6a2b1dc9cb
Component: engine
2015-11-10 13:34:53 -08:00
5474215e49
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
Upstream-commit: d575d1e0944d5b245b7b21f46015346209f4a70e
Component: engine
2015-11-10 21:32:23 +00:00
7a728fd261
Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix
...
Fixing last access time on Windows to unblock python.
Upstream-commit: 35d9bcdb5778f04b76f781dc56e0668c9383b96c
Component: engine
2015-11-10 13:17:03 -08:00
48fb9e9342
convert map value from struct to bool
...
Just for @calavera !! :-)
Per: https://github.com/docker/docker/pull/17789#discussion_r44333133
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: fbdce2547f43fdd8184cd906790cd107562734ca
Component: engine
2015-11-10 13:10:35 -08:00
e2a9504310
Merge pull request #17754 from justincormack/gpg-server
...
Add an alternate gpg server to the documentation for Ubuntu and Debian.
Upstream-commit: 3d23fdaf97fe8c2ad252a8376ca18161eda8a8de
Component: engine
2015-11-10 21:08:56 +00:00
2d895b215b
Merge pull request #17874 from LK4D4/nocheck_nil_map
...
daemon/info.go: remove check for map nilness
Upstream-commit: 5b718bdee288134e9a0cfc12d0ed655a3858747f
Component: engine
2015-11-10 12:52:52 -08:00
a03e5da6fb
Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com >
Upstream-commit: 4fca870212ea11010e9dc5ecc802d076dcc1c683
Component: engine
2015-11-10 20:44:18 +00:00
37b87b6310
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
Upstream-commit: d4c4557b1af794c4d7e4a9833b20119c0a4c091c
Component: engine
2015-11-10 19:55:46 +00:00
328de5870b
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a429ad1e35691fb01f3f80461964030d2197a0eb
Component: engine
2015-11-10 11:39:05 -08:00
ee37d11c5a
Merge pull request #17641 from libopenstorage/plugins-md
...
Add OpenStorage to plugins.md
Upstream-commit: d27e802bc54922b3e4465d7ae2e06074489796c6
Component: engine
2015-11-10 19:21:43 +00:00
d9ef640311
Merge pull request #17778 from tophj-ibm/link-fixes
...
Fixed broken links in docker_remote_api
Upstream-commit: 2f1865ae0e8326e5f4e63a5c11f8e2a29377d087
Component: engine
2015-11-10 19:17:17 +00:00
