15d116d5d9
Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
...
*Builder: fix overwrites EXPOSE
Upstream-commit: e39755666b2a3c0d9f9f20b727741bb78e903c1e
Component: engine
2013-07-22 09:51:11 -07:00
c311fa3aa0
rebase master
...
Upstream-commit: 2e0e455fa696db7a16a08b6c7dd2def7c5ff837f
Component: engine
2013-07-19 14:48:32 +00:00
31b43ff70e
add regression test from @crosbymichael
...
Upstream-commit: 2b5386f039b5c99cf0f64fb3091cc14e4446dc64
Component: engine
2013-07-19 03:01:39 +00:00
a6f1fb98b1
fix overwrites EXPOSE
...
Upstream-commit: a0eec14c7da5b213302c2675801aaf788e84efed
Component: engine
2013-07-19 02:47:35 +00:00
59f9a15c00
Merge pull request #1212 from dotcloud/merge_v_b_options
...
* Runtime: Merge -b and -v options
Upstream-commit: 578e88891577960bf0961b49a52f494cfc977a5e
Component: engine
2013-07-17 11:43:47 -07:00
df2dfb45a8
Merge -b and -v options
...
Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861
Component: engine
2013-07-15 17:51:32 -07:00
c3b2bff375
improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace
...
Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55
Component: engine
2013-07-15 13:12:33 +00:00
1aa0235482
Hack: use helper functions in tests for less copy-pasting
...
Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797
Component: engine
2013-07-12 17:56:55 -07:00
6c9e32ae32
Simplify unit tests code with mkRuntime()
...
Upstream-commit: 6bdb6f226b13d5fdd47f3665c9fb753207bf473b
Component: engine
2013-07-11 17:59:25 -07:00
b1ef39bb79
- Runtime: small bugfixes in external mount-bind integration
...
Upstream-commit: 46a9f29baef77dbe212e1261f5cecbe1b53fadb9
Component: engine
2013-06-26 15:26:47 -07:00
1c5ea40b1c
* Runtime: better integration of external bind-mounts (run -b) into the volume subsystem (run -v)
...
Upstream-commit: d4e62101abca637b5bc057ec13e73d9ce65d6161
Component: engine
2013-06-26 15:08:07 -07:00
bc6fad489c
Create a subpackage for utils
...
Upstream-commit: 2e69e1727b4d5698a90c24c5800eecd5401dc319
Component: engine
2013-05-14 22:37:35 +00:00
547af82c3d
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.
Upstream-commit: 1f65c6bf4c9dcfc513eeb9da34a7cac60c6bc4ff
Component: engine
2013-04-21 19:19:38 -06:00
be5c830b2c
Add unit tests for CompareKernelVersion
...
Upstream-commit: c42a4179fc6954a2363b181969978641553955c4
Component: engine
2013-04-18 21:34:34 -07:00
23aad300e5
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
...
Upstream-commit: 22d16229264aeb176acc40db2158d9b944cb3ef1
Component: engine
2013-04-02 20:35:13 -07:00
450827385c
Renamed writeBroadcaster.Close() to CloseWriters().
...
Upstream-commit: a83d87abd442dda5f2d67a2701aae9c7b891e68a
Component: engine
2013-04-02 10:45:17 +02:00
6d568468b4
Show shorthand container IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup containers
...
Upstream-commit: 0b9a3c86a26b4b7eb463a6c73cb030bc851fdd64
Component: engine
2013-03-31 02:02:01 -07:00
248356b56f
Make writeBroadcaster safe for concurrent use.
...
Upstream-commit: 0bdfcfaa33b4945fdfd6ff9ea82bf3c5aa63848d
Component: engine
2013-03-30 16:02:22 +01:00
5c70746915
Initial commit
...
Upstream-commit: a27b4b8cb8e838d03a99b6d2b30f76bdaf2f9e5d
Component: engine
2013-01-18 16:13:39 -08:00
