21e81bd668
Move all graph tests into integration, because they now rely on the underlying graph driver, which currently cannot be mocked.
...
Upstream-commit: fb3d60f27adba32ab60022298702a4376c1f4d0d
Component: engine
2013-11-26 05:05:15 +00:00
6c1679864e
Move integration tests to integration/, expose missing public methods in the core
...
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
2013-11-14 10:50:00 -08:00
cea9cd6554
gofmt
...
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
2013-11-13 19:25:55 +00:00
a48718c85a
Merge branch 'job-create-start-clean' into engine-patch-2
...
Conflicts:
engine/engine.go
engine/job.go
server.go
utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
2013-11-13 00:36:20 +00:00
ce1bb0ce73
fix mergeConfig with new ports
...
Upstream-commit: 49c4231f077cb0b4804768231396c596d070a22f
Component: engine
2013-11-07 14:31:25 -08:00
6d24142423
go fmt
...
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
2013-11-07 12:27:33 -08:00
e6df3df72c
Engine: 'create' creates a container and prints its ID on stdout
...
Upstream-commit: e5f8ab6160401fb541121da5b5cbc3af4fce28b7
Component: engine
2013-11-05 23:00:20 +00:00
c3fb3fd512
Better error reporting in engine logs and unit tests
...
Upstream-commit: d3f074494a9594bc268bf4c639a7aea0934ec7c0
Component: engine
2013-11-05 23:00:20 +00:00
c136168290
Hack: simplify the creation of test directories
...
Upstream-commit: 5a85456d481a5f88fc0efc02c41b3bff987c0ed1
Component: engine
2013-11-05 23:00:16 +00:00
26507356b3
Engine: 'start' starts the specified container
...
Upstream-commit: 958b4a8757e83c3fada757b10dd1be4ab7bff5ee
Component: engine
2013-11-05 18:39:59 +00:00
5e4f415366
Refactor HostConfig and escape apparmor confinement
...
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
04226c60be
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
2013-10-31 16:32:49 -07:00
7ce1e20657
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
b6319ac31a
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
...
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
2013-10-26 14:24:13 -07:00
1ea9ba1de7
fix merge issue and gofmt
...
Upstream-commit: 89fb51f6063467124c8883399fc293faae8d8ef5
Component: engine
2013-10-25 15:13:25 -07:00
952ac8a789
Add links for container relationships and introspection
...
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
d53bf7553c
hack: encode the name of the current test in temporary directories, for easier tracking
...
Conflicts:
utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
2013-10-18 07:29:07 +00:00
aa0ad01db6
Merge builder.go into runtime.go
...
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
2013-09-06 17:33:05 -07:00
dfb6c3c80f
Add lxc-conf flag to allow custom lxc options
...
Upstream-commit: 551092f9c0da2244c60b75d893ef847f915ca604
Component: engine
2013-08-22 16:05:21 +00:00
800fcaba4c
Merge branch 'master' into add_some_tests
...
Upstream-commit: be77ee33bca2399b4eb6749253b9c3ab18915783
Component: engine
2013-08-08 14:44:56 +00:00
3029f070e6
Return JSONError for HTTPResponse error
...
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
0d08c8550d
rebase master
...
Upstream-commit: 066873ebd25728fe702fc4b13ed12b5c8be15b97
Component: engine
2013-07-24 14:38:40 +00:00
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
13dc02d1d8
add VolumesFrom to MergeConfig, and test
...
Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752
Component: engine
2013-07-17 21:06:46 +00:00
ef71cbddf6
add Volumes and VolumesFrom to CompareConfig
...
Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d
Component: engine
2013-07-17 20:51:25 +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
edde9aeb1c
Add CompareConfig test
...
Upstream-commit: 48a892bee5270feea3d0e7b64963acb38dbd634b
Component: engine
2013-07-16 15:58:23 +00: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
