Commit Graph

20395 Commits

Author SHA1 Message Date
8d1f8e4c83 Added a Supervisor process management example
Upstream-commit: ba2b36e192c571566fa4769b1031d120c26b8ae0
Component: engine
2013-11-25 14:05:01 -05:00
b1b08f39e6 Rename dummy in driver.go to vfs
Upstream-commit: 8b0b10b6f9fa152346e62b5dad1f4d430ae0e4d1
Component: engine
2013-11-25 10:28:17 -08:00
9b82922439 Merge pull request #67 from crosbymichael/driver-flag
Change graph-driver flag to be s
Upstream-commit: 399c71de8331d8ff35e33c5b810a647f6ea92f1a
Component: engine
2013-11-25 09:45:31 -08:00
5c5c144532 Add daemon docs with selecting graph driver
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
2013-11-25 09:44:55 -08:00
93120354fd Change graph-driver flag to be s
Upstream-commit: b4eeb6be617d96132cbd5998a658e5ab88334940
Component: engine
2013-11-25 09:43:32 -08:00
d197a9d049 Merge pull request #69 from crosbymichael/rename-dummy
Rename dummy driver to vfs
Upstream-commit: 41704d8933990eda71ac511e0c13593264468fb9
Component: engine
2013-11-25 09:42:50 -08:00
3705ed705e Clone LVM using https: instead of git:
The ports for the git protocol are not open in all corporate environments
Upstream-commit: ad23745456f9bb9c1c3da3796a2ab769f192bf36
Component: engine
2013-11-25 17:12:18 +00:00
a54274e072 Rename dummy driver to vfs
Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482
Component: engine
2013-11-25 09:04:04 -08:00
b28704a5f5 Format lxc_template.go with gofmt
Upstream-commit: b702edadb7d63feb1f40ebfae27a4d745d4b733e
Component: engine
2013-11-24 20:02:06 -07:00
cb6dcf84c7 Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
Fixes #2802
Upstream-commit: f16c45f8b0447249074a0b41807a979a3ae326c5
Component: engine
2013-11-24 20:00:39 -07:00
15e852d771 Add unit test for awesomeness of generated container names
Upstream-commit: 07180f3aa75377b4c3227da006df00ec4f032589
Component: engine
2013-11-25 00:25:15 +00:00
057091b3c5 Add Ada Lovelace to the names generator (thanks James Turnbull)
Upstream-commit: a60647482533fcc76b80919b46aab60e4296b924
Component: engine
2013-11-25 00:22:06 +00:00
467ed87c8c New collection of random names for 0.7: mood + famous inventor. Eg. 'sad-tesla' or 'naughty-turing'
Upstream-commit: 5d6ef3177b57371c2dd9b9e4253fbc326d072554
Component: engine
2013-11-25 00:22:06 +00:00
a92bcacbc2 Better copy/paste :)
Upstream-commit: 0a89db04fe62958283c17baa11893c6ad868bf9d
Component: engine
2013-11-24 13:55:53 +01:00
51f543bb50 Corrects misspellings of 'Sphinx'
Upstream-commit: 1cce9f25b2866883b3f1c784ea642df4e69ca6bd
Component: engine
2013-11-23 16:21:27 -05:00
800614c9ba Suggest users install dependencies by using requirements.txt, not manually
Upstream-commit: f1b3e278b964fca4884dca80ffbe79c0e82a85ca
Component: engine
2013-11-23 15:53:50 -05:00
a62fb77dd4 be very explicit about docker insert - it does not insert a file into an IMAGE, it creates a new image that adds only that file to its specified parent
Upstream-commit: e288e7763e20d1d8c7b8f5f9fffa00136577ed95
Component: engine
2013-11-23 12:48:34 +10:00
7ee06b046b add 'to STDOUT' to the help, and add a simple eg that mentions it too
Upstream-commit: 9696ec509a53afaaf9b761b00f60e517634f7e4e
Component: engine
2013-11-23 12:28:50 +10:00
2f447b8d32 add more searchable info to the error message when ADD tries to go outside the context
Upstream-commit: 96b5be9dd9606a9bfbf0fdbe98bcaf8b6e77e4b1
Component: engine
2013-11-23 12:23:31 +10:00
63cc3164f1 Remove useless New*Opt functions, singleline Opt types
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
2013-11-22 14:42:30 -08:00
ce1c3dbb0a Make a validation on links name
Upstream-commit: 1c8ae47770b423b9c2f1125bd25cef0482a4600d
Component: engine
2013-11-22 14:33:25 -08:00
d6ea186ed7 Remove goroutine leak. Make sure termcap are reset each time.
Upstream-commit: d55998be81973be5b083eed56b223c8ce98ce073
Component: engine
2013-11-22 14:09:37 -08:00
627f045fff Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: e69bbd239ee8dc4bdc0963810448d9f34e4c30c4
Component: engine
2013-11-22 14:06:59 -08:00
a684772eab Merge pull request #56 from shykes/creack-dm-plugin
Use variable to call functions in devmapper_wrapper + some formatting
Upstream-commit: a26f9183bd2c0bed032fc9f7f2359352167ab3ea
Component: engine
2013-11-22 14:05:59 -08:00
a1d40e81ca Use variable to call functions in devmapper_wrapper + some formatting
Upstream-commit: 79e2b33ede415736f9124089a61f4512c16ddddd
Component: engine
2013-11-22 12:25:37 -08:00
6e7d75df95 Format CmdRun
Upstream-commit: 076c0eab704e5c4819611a42b1551f1d759fb376
Component: engine
2013-11-22 12:14:34 -08:00
4a4a051d8a Use a constant for PortSpecTemplate + display the template in the CmdRun help
Upstream-commit: 1f9223a7c2c0e5c04936c56a071830f8792c3dd7
Component: engine
2013-11-22 12:00:34 -08:00
c04337f42e Reformatting parseRun and partParse
Upstream-commit: 476559458d49b6d4eacfdbe9025ddf69947ae2b7
Component: engine
2013-11-22 11:58:02 -08:00
7c2bc2f42b Merge pull request #2769 from vbatts/none_bridge
Do not setup bridge ip if 'none' bridge is provided
Upstream-commit: d4c8fb9ee27222e4d33b616bd63ea7863e0064ee
Component: engine
2013-11-22 11:48:33 -08:00
d8bc0d9deb Merge pull request #2823 from dotcloud/2817-run_rm-fix
Fix docker run -rm
Upstream-commit: ae8c589d35e9cd7148d98a0471d0c5c9c77e3908
Component: engine
2013-11-22 11:35:29 -08:00
92b39790ed fix the nil pointer panic on closing a disabled network manager
Issue #2768
Upstream-commit: ef14aaf627377b24edb55fe2080e10f748c0e444
Component: engine
2013-11-22 14:28:49 -05:00
f1afbc9e5f fix -rm
Upstream-commit: 1e7c04fcfe0b1dbc93a8d70e7bf94e963aa764d8
Component: engine
2013-11-22 11:23:48 -08:00
170040a202 Add a few more small RELEASE-CHECKLIST tweaks, fixes, and improvements
Upstream-commit: 37e00831691567e30365c9e9ced5aa90a70f6221
Component: engine
2013-11-22 11:46:15 -07:00
65390c08ce Pass terminal setting to display utils
Upstream-commit: 8b0cd60019b33488f8819da5c7bdd28d1d3fc737
Component: engine
2013-11-22 00:05:55 -06:00
2e819ef8cf fixes #2671, add support for bind mounting individual files in to containers, rebases of #1757 #2301
Upstream-commit: 0198f8a879df8506189cf3024c4b64c9ea8f6aa6
Component: engine
2013-11-21 23:40:35 -06:00
cacce7d99b Add new tgz bundlescript to default make and release
Upstream-commit: b3f5973f41eeb0e445b16ec0813b7996fba2fde7
Component: engine
2013-11-21 22:34:54 -07:00
c1747d1722 Add new bundlescript to build a tgz
Upstream-commit: 3314e005f32f7440f1cc9009b0a453eed45ce9de
Component: engine
2013-11-21 22:34:54 -07:00
3f82c6cf46 Merge pull request #2812 from dotcloud/bump_v0.6.7
Bump v0.6.7
Upstream-commit: a93e40a158aad6f7364db5db69298e8ad7c38949
Component: engine
2013-11-21 18:39:15 -08:00
21b63b0713 update release checklist
Upstream-commit: 58f8503b7340ca34b229609a2dcb4b0fede1e638
Component: engine
2013-11-21 18:34:23 -08:00
89913b0834 Bump version to v0.6.7
Upstream-commit: 53f1bf0f995d4c0e6af3eb14cd76a1b049c851a2
Component: engine
2013-11-21 18:03:41 -08:00
cf914fd88c Merge branch 'master' into 0.6.5-dm-plugin
Conflicts:
	container.go
	image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
6ea3214afa Merge pull request #62 from shykes/devmapper-unit-tests
Devmapper unit tests
Upstream-commit: 437bdeee5901daa9d73db393767b1c5030c15143
Component: engine
2013-11-21 16:54:50 -08:00
eec0335af0 Use UTC for time
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
2013-11-21 16:43:36 -08:00
b82d2b8801 Merge pull request #2798 from dotcloud/fix_state_race
Refactor State to be 100% thread safe
Upstream-commit: 25e443a3c7f55d5ccfb1f5a96c427bd50b978f4d
Component: engine
2013-11-21 16:39:50 -08:00
915356af08 Refactor State to be 100% thread safe
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
26fbc2e027 Forbid syscalls in tests, add 2 new unit tests
Upstream-commit: bc82940a575944e4686db203356a8a3fb3a75217
Component: engine
2013-11-21 16:32:16 -08:00
0e00966e8f Merge pull request #2678 from cxmcc/minor
Minor code simplification for Containers api
Upstream-commit: d6e6214d37499977110e05d5d01cbf25dcae878f
Component: engine
2013-11-21 16:27:15 -08:00
8c720af218 Merge pull request #2488 from viirya/fix_container_volumes_delete
Skip the volumes mounted when deleting the volumes of container.
Upstream-commit: 70f1bd31041f9207ae06be5fe2680152eb154047
Component: engine
2013-11-21 16:20:22 -08:00
b7afbe130d Merge pull request #2304 from unclejack/fix_layer_size_computation
Fix layer size computation: handle hard links correctly
Upstream-commit: f7c2a00557a304af753e487d87ef5ed9b6266e27
Component: engine
2013-11-21 16:10:24 -08:00
4718170d22 Merge pull request #2731 from SvenDowideit/docker-commit-doc
make the docker commit help more copy&pasteable
Upstream-commit: 8498b44eac24f4f62cd082aa9ecac7ce503bb3ef
Component: engine
2013-11-21 15:33:05 -08:00