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
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
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
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
448f45f7c0
Merge pull request #17884 from Microsoft/jjh/proxify
...
Removing made up word from docs
Upstream-commit: 877df6bd3803de5bf3bac55e68ed30b71815350c
Component: engine
2015-11-10 23:15:45 +00: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
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
ee197e71e4
Merge pull request #17821 from HackToday/17820-fix-volume-doc
...
Fixing wrong volume doc format
Upstream-commit: 2aa9d85c92803e7b4918694ac5009597fa3fc34b
Component: engine
2015-11-10 19:03:09 +00:00
9662b3cfe7
Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link
...
Fix broken links in CONTRIBUTING.md
Upstream-commit: 9739aa056e11661a9637d38c588eeac28470dea7
Component: engine
2015-11-10 18:31:09 +00:00
704a1e00ef
Add test for builder cache with root source path
...
Fixes #17827
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 86faf1e165b8ffa0cb2394b1f5504caa1fa8f718
Component: engine
2015-11-10 10:15:09 -08:00
eed9f30045
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
Upstream-commit: 470fc94f3856640d1c85c90c62a78396a4d55d66
Component: engine
2015-11-10 09:48:33 -08:00
b28166688f
Merge pull request #17873 from Blaisorblade/patch-1
...
Fix link to installation instructions
Upstream-commit: 4aaebec1bcaf104f89cf3bd9b1c6b3be0807eb42
Component: engine
2015-11-10 17:32:21 +00:00
015026bb0d
daemon/info.go: remove check for map nilness
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17
Component: engine
2015-11-10 09:20:59 -08:00
542df63133
Fix link to installation instructions
...
Fix #17872 :
> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/ , which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/ .
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
2015-11-10 18:06:58 +01:00
b093321513
Merge pull request #17848 from Microsoft/jjh/tidyconfigstructs2
...
Tidy hostconfig struct
Upstream-commit: a6a3c42b5869d4ef25240223db44fa1527d75346
Component: engine
2015-11-10 08:57:05 -08:00
40d3ab07b8
Merge pull request #17789 from duglin/Issue17781
...
Allow for env vars to have spaces in some cases
Upstream-commit: 014bab03efd67367d13231c08cc43e2e73578824
Component: engine
2015-11-10 08:55:11 -08:00
f8fccbbc8d
Fix broken links in CONTRIBUTING.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 850f7841f7e132460be44b9a9c5e5581368c296b
Component: engine
2015-11-10 16:56:31 +01:00
838e5c6fa6
Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all
...
Add zsh completion for 'docker stats --all -a'
Upstream-commit: fb2bae5e162c91175f7cbc654de8e0fd132a0998
Component: engine
2015-11-10 11:06:32 +01:00
5b84049223
Merge pull request #17467 from WeiZhang555/fix-doc
...
fix format of man page
Upstream-commit: 34916dcc4b11b03f5532dacc8c73ef9d0598133e
Component: engine
2015-11-10 09:50:31 +00:00
e9d65a16e5
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
2015-11-10 08:47:46 +01:00
b05f4e5488
Merge pull request #17843 from LK4D4/discovery_refactor
...
Refactoring in daemon/discovery.go
Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b
Component: engine
2015-11-10 07:34:11 +01:00
9a5f43818f
Merge pull request #17847 from LK4D4/exec_unnec_var
...
Remove unnecessary var block in monitorExec
Upstream-commit: 70579bd558e08fc88c06d8925e0be288692d1eac
Component: engine
2015-11-09 23:32:38 -06:00
be40e84376
Fix man pages
...
Add contents and fix format problem for man pages.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d790469681b65d55e64750fd18d596db90a541df
Component: engine
2015-11-10 09:33:55 +08:00
6027f5a756
Merge pull request #17279 from someara/articles-chef
...
Documenation update - articles/chef
Upstream-commit: c97ac4daf0f47e66a5a4ca0011722fdbd7efe16a
Component: engine
2015-11-10 00:56:41 +00:00
4e36c60d66
Merge pull request #17844 from anthonydahanne/master
...
Implicitly use swarm:latest
Upstream-commit: 95903ece6043bdd180867cc46548c01d75b53c28
Component: engine
2015-11-09 16:10:19 -08:00
efb8f1f3fe
Fix fixed-cidr daemon option
...
- Logic is broken when gateway ip falls in ip-range
and ip-range is not the first block in the network
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: c7cd65962448888ceb1cec6a355fc7fd04f3be53
Component: engine
2015-11-09 15:51:46 -08:00
62ba8c349b
Vendoring libnetwork 5978c276ad20e104d6acd749da6ee6a8930055ae
...
- To bring in ip-range fix
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 9c395537bce1e787ae34d90b2de81df3a47c5ff9
Component: engine
2015-11-09 15:29:54 -08:00
3640b2f4c8
Tidy hostconfig struct
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 51cf074e77020ab45b84c22259488b7a0eddc36a
Component: engine
2015-11-09 15:24:23 -08:00
df0ccc7d18
Refactoring in daemon/discovery.go
...
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60
Component: engine
2015-11-09 15:21:27 -08:00
d40820af47
Merge pull request #17838 from calavera/revert_17579
...
Revert "Tidy config/hostconfig structures"
Upstream-commit: fa210a01be7927e8332c20da0770de0d855caf51
Component: engine
2015-11-09 15:21:26 -08:00
3ba5945bba
Remove unnecessary var block in monitorExec
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 445675e8081ae1e911db2ebd57efd51329574cdf
Component: engine
2015-11-09 15:14:20 -08:00
c53c22b70c
Merge pull request #17779 from calavera/fix_dns_regression
...
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
2015-11-09 18:07:07 -05:00
04e53e786a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
Upstream-commit: 4efe0def0ac2a8b6b74a818d23864f62abfaa521
Component: engine
2015-11-09 15:05:17 -08:00
7523555ae3
Merge pull request #17450 from rhatdan/selinux
...
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
2015-11-09 13:19:28 -08:00
2f262fa249
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
99a2fbf27e
Revert "Tidy config/hostconfig structures"
...
This reverts commit ad5052df234e4f48a93e22694f91fda36bb9e95d.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3a1200f9f11a016abd75588fa3812fb5505b2c3a
Component: engine
2015-11-09 15:46:45 -05:00
