89fb51f606
fix merge issue and gofmt
2013-10-25 15:13:25 -07:00
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
b629810fe0
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
2013-10-18 07:29:07 +00:00
24e02043a2
Merge builder.go into runtime.go
2013-09-06 17:33:05 -07:00
551092f9c0
Add lxc-conf flag to allow custom lxc options
2013-08-22 16:05:21 +00:00
be77ee33bc
Merge branch 'master' into add_some_tests
2013-08-08 14:44:56 +00:00
dae585c6e4
Return JSONError for HTTPResponse error
2013-08-03 00:27:58 +00:00
066873ebd2
rebase master
2013-07-24 14:38:40 +00:00
e39755666b
Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
...
*Builder: fix overwrites EXPOSE
2013-07-22 09:51:11 -07:00
2e0e455fa6
rebase master
2013-07-19 14:48:32 +00:00
2b5386f039
add regression test from @crosbymichael
2013-07-19 03:01:39 +00:00
a0eec14c7d
fix overwrites EXPOSE
2013-07-19 02:47:35 +00:00
1a226f0e28
add VolumesFrom to MergeConfig, and test
2013-07-17 21:06:46 +00:00
7c00201222
add Volumes and VolumesFrom to CompareConfig
2013-07-17 20:51:25 +00:00
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
48a892bee5
Add CompareConfig test
2013-07-16 15:58:23 +00:00
eefbadd230
Merge -b and -v options
2013-07-15 17:51:32 -07:00
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
080243f040
Hack: use helper functions in tests for less copy-pasting
2013-07-12 17:56:55 -07:00
6bdb6f226b
Simplify unit tests code with mkRuntime()
2013-07-11 17:59:25 -07:00
46a9f29bae
- Runtime: small bugfixes in external mount-bind integration
2013-06-26 15:26:47 -07:00
d4e62101ab
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
2013-06-26 15:08:07 -07:00
2e69e1727b
Create a subpackage for utils
2013-05-14 22:37:35 +00:00
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
c42a4179fc
Add unit tests for CompareKernelVersion
2013-04-18 21:34:34 -07:00
22d1622926
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
2013-04-02 20:35:13 -07:00
a83d87abd4
Renamed writeBroadcaster.Close() to CloseWriters().
2013-04-02 10:45:17 +02:00
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
0bdfcfaa33
Make writeBroadcaster safe for concurrent use.
2013-03-30 16:02:22 +01:00
a27b4b8cb8
Initial commit
2013-01-18 16:13:39 -08:00
Victor Vieux