Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Guillaume J. Charmes
6998c3c387
go fmt
2013-11-07 12:27:33 -08:00
Jérôme Petazzoni
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Solomon Hykes
36c7a7ae94
Partial merge of devmapper/ in order to integrate it as a backend
...
plugin.
The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
2013-11-01 04:24:17 +00:00
Victor Vieux
e3c49843d7
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
2013-10-31 16:32:49 -07:00
Michael Crosby
0d2924408b
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.
2013-10-28 18:09:08 -07:00
Solomon Hykes
7e691e11b0
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
2013-10-26 14:24:13 -07:00
Victor Vieux
89fb51f606
fix merge issue and gofmt
2013-10-25 15:13:25 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Solomon Hykes
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
Solomon Hykes
5f58a1fbe4
hack: encode the name of the current test in temporary directories, for easier tracking
2013-10-18 06:47:08 +00:00
Solomon Hykes
153248b60f
devicemapper: remove unused code
2013-10-16 23:23:35 +00:00
Solomon Hykes
11d695a297
Add debug messages while testing devicemapper
2013-10-16 20:45:59 +00:00
Solomon Hykes
7093411a8d
Initialize devicemapper in NewRuntimeFromDIrectory
2013-10-15 03:53:48 +00:00
Alexander Larsson
c77697a45c
devmapper: Move all "raw" libdevmapper wrappers to devmapper.go
...
This separates out the DeviceSet logic a bit better from the raw
device mapper operations.
devicemapper: Serialize addess to the devicemapper deviceset
This code is not safe to run in multiple threads at the same time,
and neither is libdevmapper.
DeviceMapper: Move deactivate into UnmountDevice
This way the deactivate is atomic wrt othe device mapper operations
and will not fail with EBUSY if someone else starts a devicemapper
operation inbetween unmount and deactivate.
devmapper: Fix loopback mounting regression
Some changes were added to attach_loop_device which added
a perror() in a place that caused it to override errno so that
a later errno != EBUSY failed. This fixes that and cleans up
the error reporting a bit.
devmapper: Build on old kernels without LOOP_CTL_GET_FREE define
2013-10-11 16:30:02 -07:00
Guillaume J. Charmes
f29c500d8d
Small fixes
2013-10-03 18:05:07 -07:00
Victor Vieux
ebfa24acb0
go fmt and aufs support removed
2013-09-26 15:40:13 +00:00
Victor Vieux
5e1d540209
Revert "add a -mount-method flag"
...
This reverts commit e52d756f40c9ccf8b37ca496cb72be057c909ed7.
2013-09-26 15:14:03 +00:00
Alexander Larsson
d47c18c5fb
Reuse a single DeviceSetDM for all the tests
...
We wrap the "real" DeviceSet for each test so that we get only
a single device-mapper pool and loopback mounts, but still
separate out the IDs in the tests. This makes the test run
much faster.
2013-09-26 15:09:31 +00:00
Alexander Larsson
f317a6b6fe
Runtime: Add DeviceSet singleton
...
This adds a DeviceSet singleton to the Runtime object which will be used for
any DeviceMapper dependent code.
2013-09-26 15:08:54 +00:00
Solomon Hykes
24e02043a2
Merge builder.go into runtime.go
2013-09-06 17:33:05 -07:00
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
