Victor Vieux
179aa17c74
fix mergeConfig with new ports
2013-11-07 14:31:25 -08:00
Guillaume J. Charmes
51366f918e
go fmt
2013-11-07 12:27:33 -08:00
Jérôme Petazzoni
0914b384bf
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Victor Vieux
e7a8a176b7
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
97dea5afdc
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
d8dcc913e4
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
61d442f436
fix merge issue and gofmt
2013-10-25 15:13:25 -07:00
Michael Crosby
36d6b76cad
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Solomon Hykes
d1ea71a56b
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
134e37d84a
Merge builder.go into runtime.go
2013-09-06 17:33:05 -07:00
Michael Crosby
a8b3e889ad
Add lxc-conf flag to allow custom lxc options
2013-08-22 16:05:21 +00:00
Victor Vieux
74e093e263
Merge branch 'master' into add_some_tests
2013-08-08 14:44:56 +00:00
Michael Crosby
ea235bc5f5
Return JSONError for HTTPResponse error
2013-08-03 00:27:58 +00:00
Victor Vieux
f7288f84e1
rebase master
2013-07-24 14:38:40 +00:00
Victor Vieux
20f5dbf6f6
Merge pull request #1236 from dotcloud/1234_overwrites_expose-fix
...
*Builder: fix overwrites EXPOSE
2013-07-22 09:51:11 -07:00
Victor Vieux
04e0f25b51
rebase master
2013-07-19 14:48:32 +00:00
Victor Vieux
5930cbc181
add regression test from @crosbymichael
2013-07-19 03:01:39 +00:00
Victor Vieux
e662fab1fc
fix overwrites EXPOSE
2013-07-19 02:47:35 +00:00
Victor Vieux
fc05cdd9f7
add VolumesFrom to MergeConfig, and test
2013-07-17 21:06:46 +00:00
Victor Vieux
d60625b22c
add Volumes and VolumesFrom to CompareConfig
2013-07-17 20:51:25 +00:00
Guillaume J. Charmes
2854dbeaba
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
d291a29344
Add CompareConfig test
2013-07-16 15:58:23 +00:00
Guillaume J. Charmes
212eeb69a7
Merge -b and -v options
2013-07-15 17:51:32 -07:00
Victor Vieux
f8573af974
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
cd606f8090
Hack: use helper functions in tests for less copy-pasting
2013-07-12 17:56:55 -07:00
Solomon Hykes
677a3f4bad
Simplify unit tests code with mkRuntime()
2013-07-11 17:59:25 -07:00
Solomon Hykes
1f7cd31bbc
- Runtime: small bugfixes in external mount-bind integration
2013-06-26 15:26:47 -07:00
Solomon Hykes
57db07f082
* 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
a82d51d4b1
Create a subpackage for utils
2013-05-14 22:37:35 +00:00
Tianon Gravi
088d53b6fa
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
8b75443e2d
Add unit tests for CompareKernelVersion
2013-04-18 21:34:34 -07:00
Solomon Hykes
3d02b3c1c0
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
2013-04-02 20:35:13 -07:00
Robert Obryk
bcf056683b
Renamed writeBroadcaster.Close() to CloseWriters().
2013-04-02 10:45:17 +02:00
Solomon Hykes
f13fe3e23b
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
239e6cccce
Make writeBroadcaster safe for concurrent use.
2013-03-30 16:02:22 +01:00
Andrea Luzzardi
70e2b10ccf
Initial commit
2013-01-18 16:13:39 -08:00