summaryrefslogtreecommitdiff
path: root/runtime
Commit message (Expand)AuthorAgeFilesLines
* Make volumes-from a slice instead of string splitMichael Crosby2014-04-081-3/+3
* Move volumesfrom to hostconfigMichael Crosby2014-04-081-3/+4
* Merge pull request #5089 from creack/replace_existing_docker_apparmor_profileMichael Crosby2014-04-081-3/+5
|\
| * Backup current docker apparmor profile and replace it with the new oneGuillaume J. Charmes2014-04-081-3/+5
* | Merge pull request #5066 from crosbymichael/remove-dns-confSolomon Hykes2014-04-082-50/+69
|\ \ | |/ |/|
| * Move DNS options to hostconfigMichael Crosby2014-04-072-50/+69
* | Fix edge case in bind mount absolute path detectionTianon Gravi2014-04-071-6/+2
|/
* Ensure that selinux is disabled by defaultMichael Crosby2014-04-071-0/+4
* Move -o cli flag and DriverConfig from HostConfigMichael Crosby2014-04-071-5/+1
* Clean runtime create and make it simpleMichael Crosby2014-04-071-53/+103
* Move history to separate fileMichael Crosby2014-04-072-27/+30
* Remove driver wide mount label for dmMichael Crosby2014-04-031-7/+5
* Remove runtime options from configMichael Crosby2014-04-031-2/+2
* Fix lxc label handleingMichael Crosby2014-04-021-12/+1
* Merge branch 'selinux' of https://github.com/rhatdan/docker into rhatdan-selinuxMichael Crosby2014-04-021-2/+3
|\
| * Fix SELinux issue with missing Contexts in lxc execdriverDan Walsh2014-04-031-3/+3
* | Fix configuration test for MKNODMichael Crosby2014-04-021-1/+4
* | Allow non-privileged containers to create device nodes.Kevin Wallace2014-04-033-2/+4
* | Fix --volumes-from mount failureAlexander Larsson2014-04-031-1/+6
* | devmapper: Avoid AB-BA deadlockAlexander Larsson2014-04-021-23/+35
* | devmapper: Add lock to protext Devices mapAlexander Larsson2014-04-021-1/+26
* | devmapper: Add lookupDevice() helperAlexander Larsson2014-04-021-23/+32
* | devmapper: Pass info rather than hash to setInitializedAlexander Larsson2014-04-021-7/+2
* | devmapper: Pass info rather than hash to deactivateDevice()Alexander Larsson2014-04-021-19/+14
* | devmapper: Pass info rather than hash to deleteDeviceAlexander Larsson2014-04-021-8/+3
* | devmapper: Pass info rather than hash to activateDeviceIfNeededAlexander Larsson2014-04-021-10/+6
* | Merge pull request #4931 from crosbymichael/gen-mac-addr-for-bridgeunclejack2014-04-021-24/+6
|\ \
| * | Set bridge mac addr on supported kernelsMichael Crosby2014-03-311-24/+6
* | | Merge pull request #4867 from crosbymichael/clean-shutdownunclejack2014-04-025-6/+83
|\ \ \
| * | | Send sigterm and wait foreverMichael Crosby2014-04-012-4/+8
| * | | Ensure state is saved to disk after we kill the ghostMichael Crosby2014-04-011-0/+3
| * | | Ensure a reliable way to kill ghost containers on rebootMichael Crosby2014-04-014-4/+39
| * | | Add kill for other drivers on restartMichael Crosby2014-04-011-2/+14
| * | | Ensure that all containers are stopped cleanly at shutdownMichael Crosby2014-04-011-0/+23
* | | | Update test to reallocate portMichael Crosby2014-04-011-0/+13
* | | | Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limitGuillaume J. Charmes2014-04-012-6/+10
|\ \ \ \ | |/ / / |/| | |
| * | | make findNextPort circular, add all-ports-allocated errortjmehta2014-03-312-6/+10
* | | | Merge pull request #4833 from crosbymichael/pluginflagGuillaume J. Charmes2014-04-0111-152/+588
|\ \ \ \
| * | | | Update imports to be consistentMichael Crosby2014-04-012-2/+4
| * | | | Update native driver to use labels from optsMichael Crosby2014-03-271-0/+17
| * | | | Update lxc to use opts for selinux labelsMichael Crosby2014-03-272-9/+25
| * | | | Fix compile and unit test errors after mergeMichael Crosby2014-03-273-9/+20
| * | | | Merge branch 'master' into pluginflagMichael Crosby2014-03-2718-109/+197
| |\ \ \ \
| * | | | | Add unit test for lxc conf merge and native optsMichael Crosby2014-03-248-47/+265
| * | | | | Add cpuset.cpus to cgroups and native driver optionsMichael Crosby2014-03-241-6/+29
| * | | | | Add more native driver optionsMichael Crosby2014-03-211-6/+74
| * | | | | Change syntax to use dotsMichael Crosby2014-03-215-123/+85
| * | | | | Change flag to -o and --optMichael Crosby2014-03-213-1/+23
| * | | | | Factor out the native driver config optionsMichael Crosby2014-03-218-130/+207
| * | | | | Allow containers to join the net namespace of other conatinersMichael Crosby2014-03-212-8/+34