Michael Crosby
551092f9c0
Add lxc-conf flag to allow custom lxc options
2013-08-22 16:05:21 +00:00
Victor Vieux
be77ee33bc
Merge branch 'master' into add_some_tests
2013-08-08 14:44:56 +00:00
Michael Crosby
dae585c6e4
Return JSONError for HTTPResponse error
2013-08-03 00:27:58 +00:00
Victor Vieux
066873ebd2
rebase master
2013-07-24 14:38:40 +00:00
Victor Vieux
e39755666b
Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
...
*Builder: fix overwrites EXPOSE
2013-07-22 09:51:11 -07:00
Victor Vieux
2e0e455fa6
rebase master
2013-07-19 14:48:32 +00:00
Victor Vieux
2b5386f039
add regression test from @crosbymichael
2013-07-19 03:01:39 +00:00
Victor Vieux
a0eec14c7d
fix overwrites EXPOSE
2013-07-19 02:47:35 +00:00
Victor Vieux
1a226f0e28
add VolumesFrom to MergeConfig, and test
2013-07-17 21:06:46 +00:00
Victor Vieux
7c00201222
add Volumes and VolumesFrom to CompareConfig
2013-07-17 20:51:25 +00:00
Guillaume J. Charmes
578e888915
Merge pull request #1212 from dotcloud/merge_v_b_options
...
* Runtime: Merge -b and -v options
2013-07-17 11:43:47 -07:00
Victor Vieux
48a892bee5
Add CompareConfig test
2013-07-16 15:58:23 +00:00
Guillaume J. Charmes
eefbadd230
Merge -b and -v options
2013-07-15 17:51:32 -07:00
Victor Vieux
193a7e1dc1
improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace
2013-07-15 13:12:33 +00:00
Solomon Hykes
080243f040
Hack: use helper functions in tests for less copy-pasting
2013-07-12 17:56:55 -07:00
Solomon Hykes
6bdb6f226b
Simplify unit tests code with mkRuntime()
2013-07-11 17:59:25 -07:00
Solomon Hykes
46a9f29bae
- Runtime: small bugfixes in external mount-bind integration
2013-06-26 15:26:47 -07:00
Solomon Hykes
d4e62101ab
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
2013-06-26 15:08:07 -07:00
Guillaume J. Charmes
2e69e1727b
Create a subpackage for utils
2013-05-14 22:37:35 +00:00
Tianon Gravi
1f65c6bf4c
Update utils.go to not enforce extra constraints on the kernel "flavor" (such as being integral or even comparable one to another)
...
This is especially to fix the current docker on kernels such as gentoo-sources, where the "flavor" is the string "gentoo", and that obviously fails to be converted to an integer.
2013-04-21 19:19:38 -06:00
Guillaume J. Charmes
c42a4179fc
Add unit tests for CompareKernelVersion
2013-04-18 21:34:34 -07:00
Solomon Hykes
22d1622926
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
2013-04-02 20:35:13 -07:00
Robert Obryk
a83d87abd4
Renamed writeBroadcaster.Close() to CloseWriters().
2013-04-02 10:45:17 +02:00
Solomon Hykes
0b9a3c86a2
Show shorthand container IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup containers
2013-03-31 02:02:01 -07:00
Robert Obryk
0bdfcfaa33
Make writeBroadcaster safe for concurrent use.
2013-03-30 16:02:22 +01:00
Andrea Luzzardi
a27b4b8cb8
Initial commit
2013-01-18 16:13:39 -08:00
