Stephen Rust
0ef740a5bf
Don't hold lock around volume driver for volume create.
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
2015-08-28 16:28:28 -04:00
Sebastiaan van Stijn
b1cb1b1df4
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
2015-08-28 19:47:43 +02:00
David Calavera
e6e210164e
Merge pull request #15910 from mimoralea/patch-1
...
Typo fix then -> than
2015-08-28 18:09:26 +02:00
Miguel Morales
95e3a4ca6d
Typo fix then -> than
...
Signed-off-by: Miguel Morales <mimoralea@hp.com >
2015-08-28 10:44:39 -05:00
David Calavera
433956cc47
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
2015-08-28 17:34:36 +02:00
Alexander Morozov
6caaa8a635
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
2015-08-28 08:27:36 -07:00
Morgan Bauer
abd72d4008
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-27 22:07:42 -07:00
Vincent Demeester
0bd016b1c3
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-27 17:36:11 +02:00
Sevki Hasirci
5572148477
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
2015-08-27 11:40:27 +02:00
Alexander Morozov
459c2c66c3
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
2015-08-26 14:00:53 -07:00
Vincent Demeester
c1af0ac082
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-26 22:59:48 +02:00
Alexander Morozov
47cdae243a
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
2015-08-26 13:29:24 -07:00
Sebastiaan van Stijn
fa13f7cde8
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
2015-08-26 21:57:12 +02:00
John Howard
f11ba3135b
Windows: Fix use of IsAbs check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-26 12:38:28 -07:00
Brian Goff
b3b7eb2723
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-26 13:37:52 -04:00
Jessie Frazelle
5dadfa8b69
Merge pull request #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
2015-08-26 10:29:25 -07:00
Brian Goff
2cec06fbcd
Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers
...
Fix restart docker daemon with paused containers
2015-08-26 09:04:14 -04:00
David Calavera
688dd8477e
Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
...
This reverts commit d88fe447df .
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-26 05:23:00 -04:00
Jessica Frazelle
bd06432ba3
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-25 13:00:41 -07:00
David Calavera
6f8c4480e4
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
2015-08-25 16:42:13 +02:00
Lei Jitang
9a9724ad56
Fix docker daemon restart with paused container.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-25 09:42:58 +08:00
Jessie Frazelle
903cd2b9e3
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
2015-08-24 17:55:03 -07:00
Brian Goff
562cc6254f
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
2015-08-24 20:15:09 -04:00
Ma Shimiao
dea78fc2ce
fix 9939: docker does not remove btrfs subvolumes when destroying container
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-24 14:52:07 -07:00
Alexander Morozov
6b21e98432
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
2015-08-24 10:58:49 -07:00
Brian Goff
fd8b25c802
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
2015-08-24 13:48:56 -04:00
Alexander Morozov
1544c5edb6
Merge pull request #15735 from tonistiigi/graph-register-readcloser
...
Make graph.Register take in io.Reader
2015-08-24 10:40:04 -07:00
Alexander Morozov
386aefb9fc
Make events test more deterministic in go1.5
...
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-24 09:35:11 -07:00
Brian Goff
e14eaba784
Merge pull request #12918 from thieman/tnt-issue-12595
...
Use image ID in ps if tag has been updated
2015-08-24 12:24:42 -04:00
Qiang Huang
c99ed5ae5d
Change return value for ValidateMountMode
...
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-24 17:28:19 +08:00
David Calavera
9bac520c12
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
2015-08-24 11:03:41 +02:00
Travis Thieman
2167f40a76
Use image ID if tag has been updated
...
Fixes #12595
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
2015-08-23 12:11:24 -04:00
Lei Jitang
ce5bbed858
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-22 10:09:07 +08:00
Jessie Frazelle
90801ab939
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
2015-08-21 16:34:03 -07:00
Jessie Frazelle
9bd8a9b66b
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
2015-08-21 14:34:27 -07:00
Jessie Frazelle
ecff4badcd
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
2015-08-21 14:27:59 -07:00
Jessie Frazelle
19f7bfcda9
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
2015-08-21 14:23:44 -07:00
Jessie Frazelle
9b8cfb6c79
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
2015-08-21 14:21:10 -07:00
Stefan J. Wernli
a456f20b44
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-21 13:23:04 -07:00
Tonis Tiigi
2d1158790d
Make graph.Register take in io.Reader
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-20 20:37:11 -07:00
Lei Jitang
c8a46cb0b2
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
2015-08-21 11:29:53 +08:00
Doug Davis
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
Clinton Kitson
6b8129d1fe
added check for bind on create to determine local volume driver
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
2015-08-20 01:40:04 -07:00
Ma Shimiao
a6ed990593
daemon/state: separate part of SetRestarting to setRestarting
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-20 11:14:28 +08:00
Mrunal Patel
d88fe447df
Add support for sharing /dev/shm/ and /dev/mqueue between containers
...
This changeset creates /dev/shm and /dev/mqueue mounts for each container under
/var/lib/containers/<id>/ and bind mounts them into the container. When --ipc:container<id/name>
is used, then the /dev/shm and /dev/mqueue of the ipc container are used instead of creating
new ones for the container.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-08-19 12:36:52 -04:00
Qiang Huang
b6f1b4ad35
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 23:56:55 +08:00
Qiang Huang
87959dbfac
Add CheckKernelVersion so we can check any specific version
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 23:49:52 +08:00
Phil Estes
70c4b6e619
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
2015-08-19 08:05:27 -07:00
Sebastiaan van Stijn
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
Laszlo Meszaros
78676f19c1
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com >
2015-08-19 14:16:40 +02:00