Mohammed Aaqib Ansari
2910f1101d
Using checkers assert for integration-cli/docker_cli_events_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-11-11 18:12:30 -05:00
Antonio Murdaca
9d4e2f3992
Merge pull request #17913 from clnperez/oom-test-requires
...
Add the memoryLimitSupport requirement to Events OOM tests
2015-11-11 23:24:10 +01:00
Alexander Morozov
6c82fba2b3
Merge pull request #17894 from mqliang/deferMove
...
move defer statement for readability
2015-11-11 14:03:48 -08:00
Tibor Vass
adb14543fd
Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
...
Devicemapper: Default to xfs instead of ext4
2015-11-11 16:42:58 -05:00
moxiegirl
6c5395360f
Merge pull request #17883 from dave-tucker/bug/17709
...
Add required ports for Overlay to docs
2015-11-11 13:10:22 -08:00
Sebastiaan van Stijn
e49e6b7bfd
Merge pull request #17915 from moxiegirl/17764-fix
...
Adding in Contiv plugins
2015-11-11 20:56:57 +00:00
Mary Anthony
40fc3a8bcf
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>
2015-11-11 12:56:07 -08:00
moxiegirl
f74c423255
Merge pull request #17813 from davidcurrie/mhn-updates
...
Updates to Get started with multi-host networking
2015-11-11 12:43:45 -08:00
David Currie
f16dceb632
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>
2015-11-11 20:31:18 +00:00
Arnaud Porterie
37dfae3cde
Merge pull request #17909 from LK4D4/info_simple
...
daemon/info.go: assign proxy fields directly
2015-11-11 21:15:13 +01:00
Sebastiaan van Stijn
ee8aadbdd9
Merge pull request #17807 from albers/completion-network-yes
...
Align configuration of bash completion with existing values
2015-11-11 20:01:27 +00:00
Alexander Morozov
1df0bb5a13
daemon/info.go: assign proxy fields directly
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 11:03:53 -08:00
David Calavera
0b566566c6
Merge pull request #17858 from sanimej/libn
...
Allow port mapping only for endpoint created on docker run
2015-11-11 11:00:31 -08:00
Alexander Morozov
2bb1c530d7
Merge pull request #17193 from cpuguy83/refactor_store_errors
...
Refactor volume store's error usage
2015-11-11 10:25:00 -08:00
Dave Tucker
44a527d877
Add required ports for Overlay to docs
...
Fixes #17709
Signed-off-by: Dave Tucker <dt@docker.com>
2015-11-11 18:04:07 +00:00
Tibor Vass
7a985cfafc
Merge pull request #17890 from aboch/b6
...
Restore deterministic IPv6 from MAC behavior on default bridge network
2015-11-11 12:42:08 -05:00
Vivek Goyal
07ff17fb85
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>
2015-11-11 12:07:35 -05:00
Vivek Goyal
83a34e000b
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>
2015-11-11 12:07:35 -05:00
Alessandro Boch
095a8ac545
Restore IPv6 from MAC on default bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-11 08:36:04 -08:00
Vincent Demeester
2a7b5f6657
Merge pull request #17880 from duglin/TweakMap
...
convert map value from struct to bool
2015-11-11 13:49:50 +01:00
Sebastiaan van Stijn
9498e9b732
Merge pull request #17800 from Starefossen/patch-1
...
Utillize build cache for Node.js web app example
2015-11-11 09:56:40 +00:00
Vincent Demeester
d6856db128
Merge pull request #17012 from fgimenez/9986-ipallocator-excludes-bridge-ip
...
Test to ensure that the bridge ip is excluded from the allocator pool
2015-11-11 10:42:13 +01:00
Vincent Batts
1066725395
Merge pull request #16774 from tonistiigi/15643-aufs-plnk
...
Copy aufs hardlinks to top layer
2015-11-11 07:59:41 +01:00
Alessandro Boch
43b3b6ecb4
Vendoring libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-10 21:13:25 -08:00
Tibor Vass
09980ef7ac
Merge pull request #17853 from aboch/ipr
...
Fix fixed-cidr daemon option
2015-11-10 23:38:33 -05:00
mqliang
d71eeb1c05
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-11 11:28:23 +08:00
Brian Goff
43012fe842
Refactor volume store's error usage
...
Uses an errors API similar the `net` package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-10 20:33:29 -05:00
Christy Perez
e86b79fccc
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>
2015-11-10 18:06:13 -06:00
David Calavera
69f73252e9
Merge pull request #17881 from aaronlehmann/import-logging
...
Correct import event logging
2015-11-10 15:48:02 -08:00
Antonio Murdaca
75c0cc2f10
Merge pull request #17875 from tonistiigi/17827-builder-root-source
...
Add test for builder cache with root source path
2015-11-11 00:20:25 +01:00
Sebastiaan van Stijn
877df6bd38
Merge pull request #17884 from Microsoft/jjh/proxify
...
Removing made up word from docs
2015-11-10 23:15:45 +00:00
John Howard
2d87dd5c6e
Removing made up word
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 14:37:23 -08:00
Hans Kristian Flaatten
641c739fc1
Utillize build cache for Node.js web app example
...
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com>
2015-11-10 23:05:32 +01:00
Aaron Lehmann
77cd22ea73
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>
2015-11-10 13:34:53 -08:00
Sebastiaan van Stijn
d575d1e094
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
2015-11-10 21:32:23 +00:00
David Calavera
35d9bcdb57
Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix
...
Fixing last access time on Windows to unblock python.
2015-11-10 13:17:03 -08:00
Doug Davis
fbdce2547f
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>
2015-11-10 13:10:35 -08:00
Sebastiaan van Stijn
3d23fdaf97
Merge pull request #17754 from justincormack/gpg-server
...
Add an alternate gpg server to the documentation for Ubuntu and Debian.
2015-11-10 21:08:56 +00:00
David Calavera
5b718bdee2
Merge pull request #17874 from LK4D4/nocheck_nil_map
...
daemon/info.go: remove check for map nilness
2015-11-10 12:52:52 -08:00
Justin Cormack
4fca870212
Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com>
2015-11-10 20:44:18 +00:00
Sebastiaan van Stijn
d4c4557b1a
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
2015-11-10 19:55:46 +00:00
John Howard
a429ad1e35
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 11:39:05 -08:00
Sebastiaan van Stijn
d27e802bc5
Merge pull request #17641 from libopenstorage/plugins-md
...
Add OpenStorage to plugins.md
2015-11-10 19:21:43 +00:00
Sebastiaan van Stijn
2f1865ae0e
Merge pull request #17778 from tophj-ibm/link-fixes
...
Fixed broken links in docker_remote_api
2015-11-10 19:17:17 +00:00
Sebastiaan van Stijn
2aa9d85c92
Merge pull request #17821 from HackToday/17820-fix-volume-doc
...
Fixing wrong volume doc format
2015-11-10 19:03:09 +00:00
Sebastiaan van Stijn
9739aa056e
Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link
...
Fix broken links in CONTRIBUTING.md
2015-11-10 18:31:09 +00:00
Tonis Tiigi
86faf1e165
Add test for builder cache with root source path
...
Fixes #17827
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-10 10:15:09 -08:00
David Calavera
470fc94f38
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
2015-11-10 09:48:33 -08:00
Sebastiaan van Stijn
4aaebec1bc
Merge pull request #17873 from Blaisorblade/patch-1
...
Fix link to installation instructions
2015-11-10 17:32:21 +00:00
Alexander Morozov
8f311f4d8c
daemon/info.go: remove check for map nilness
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-10 09:20:59 -08:00