7bd70e19f4
Make docs build without warnings or errors. Minor additional cleanup. Upstream-commit: 54f9cdb0c30ef7d192c4ae59c669a7a5fd7d1003 Component: engine
Andy Rothfusz2013-07-18 19:04:51 -07:00
608601a191
change -b -> -v and add udp example Upstream-commit: b083418257edbcb769dd1bf9a6a3dafd334d5969 Component: engine
Victor Vieux2013-07-18 16:24:12 +00:00
093a55ab02
Merge pull request #1169 from crosbymichael/buildfile-tests
Victor Vieux2013-07-18 08:35:23 -07:00
1df4154799
Add unit tests for buildfile config instructions
Michael Crosby2013-07-08 17:06:06 -09:00
e1b72763dc
add debug and simplify docker logs Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085 Component: engine
Victor Vieux2013-07-18 13:29:40 +00:00
9423c7f84d
add legacy support Upstream-commit: a926cd4d880904258e01ea521ecd9e1b908f2b97 Component: engine
Victor Vieux2013-07-18 13:25:47 +00:00
97e62e30e8
Make dockerfile docs easier to find. Clean up formatting. Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630 Component: engine
Andy Rothfusz2013-07-17 18:56:40 -07:00
7c7e6abf06
+ Runtime: inject dockerinit at /.dockerinit instead of overwriting /sbin/init. This makes it possible to run /sbin/init inside a container. Upstream-commit: 5d8efc107d2c7b7da61a6d22657190c6f13713d2 Component: engine
Solomon Hykes2013-06-14 16:56:08 -07:00
13dc02d1d8
add VolumesFrom to MergeConfig, and test Upstream-commit: 1a226f0e28e7da4eb3701b31dbe959142c42b752 Component: engine
Victor Vieux2013-07-17 21:06:46 +00:00
ef71cbddf6
add Volumes and VolumesFrom to CompareConfig Upstream-commit: 7c00201222e29989214b7e8a221b057daba0a27d Component: engine
Victor Vieux2013-07-17 20:51:25 +00:00
fb0bdc7ba8
prevent any kind of operation simultaneously Upstream-commit: 2db99441c85fdf1e7d468bc02b085d9e1b95704c Component: engine
Victor Vieux2013-07-17 20:39:36 +00:00
76eb7762ab
Small changes in changelog wording Upstream-commit: 8af945f353379a96eb036d67fb24d489c5e16808 Component: engine
Solomon Hykes2013-07-17 11:39:38 -07:00
28398dc429
updated with notes from @vieux Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20 Component: engine
Ken Cochrane2013-07-17 13:46:11 -04:00
7d6b6db98e
fix docker rmi via id Upstream-commit: 5a934fc923af316a6e82b9dd11169484b3b744f6 Component: engine
Victor Vieux2013-07-17 15:48:53 +00:00
be8eb02780
Always stop the opposite goroutine in network_proxy.go (closes#1213) Upstream-commit: c766d064ac6c2183321cb2e47ea8c0b0b2d2d238 Component: engine
Louis Opter2013-07-17 01:02:07 -07:00
df2dfb45a8
Merge -b and -v options Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861 Component: engine
Guillaume J. Charmes2013-07-15 17:18:11 -07:00
723f4f9ef0
Bump version to 0.5.0 Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0 Component: engine
Guillaume J. Charmes2013-07-15 14:55:51 -07:00
08204dd54e
Add unit test to check wrong uid case Upstream-commit: e41507bde2d87cb9bbb0c328e414a39354dae10e Component: engine
Guillaume J. Charmes2013-07-01 17:08:42 -07:00
80066854b8
store both logs in a same file, as JSON Upstream-commit: 599f85d4e4362f24dc2850c71a689671122c456b Component: engine
Victor Vieux2013-07-15 16:17:58 +00:00
cb4f99ad54
Merge branch 'master' into new_logs Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0 Component: engine
Victor Vieux2013-07-15 13:57:54 +00:00
c3b2bff375
improve mergeconfig, if dns, portspec, env or volumes specify in docker run, apend and not replace Upstream-commit: 193a7e1dc1945bc9988b6205c63db9d2e0578c55 Component: engine
Victor Vieux2013-07-15 13:12:33 +00:00
632014a7bf
docker.upstart: use the same start/stop events as sshd
Jonas Pfenniger2013-07-15 11:41:19 +01:00
913ca03001
useless function. forgot to remove it. Upstream-commit: a3b1a9f01a1c08c63e6c37945414481176817ba6 Component: engine
benoitc2013-07-13 17:04:04 +02:00
2ad516346a
useless type Upstream-commit: 507cef8bcea5b56d25d34ca7073c46f608962f19 Component: engine
benoitc2013-07-13 17:03:04 +02:00
48162573ba
put the websocket route in the map containing all routes
benoitc2013-07-13 16:59:07 +02:00
1aa0235482
Hack: use helper functions in tests for less copy-pasting Upstream-commit: 080243f0407a90cdacf128dc3b53a802549d7797 Component: engine
Solomon Hykes2013-07-12 17:56:55 -07:00
51c31b8a66
*Client: Fix the progressbar, without manipulating other outputs
Marcus Farkas2013-07-12 20:15:25 +02:00
23db3e215b
Revert "Client: better progressbar output"
Marcus Farkas2013-07-12 20:08:45 +02:00
aa8559ee18
updated the rmi command docs, the had typos Upstream-commit: 364f48d6c7386874ee3fa0696b7a466f76fcf698 Component: engine
Ken Cochrane2013-07-12 14:05:26 -04:00
f649b0a057
updated the help commands on a few commands that were not correct Upstream-commit: 4174e7aa7a6600a2cfedd1c568000556cf1daf79 Component: engine
Ken Cochrane2013-07-12 13:55:26 -04:00
014efc77a7
Remove the os.user dependency and manually lookup /etc/passwd instead Upstream-commit: eb38750d99d4f9706cb2abcb861c84e1d309bd40 Component: engine
Guillaume J. Charmes2013-07-01 16:48:59 -07:00
c8bc9a992c
Fixed tag option for "docker pull" (the option was ignored) Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba Component: engine
Sam Alba2013-07-12 10:42:54 -07:00
3442b5e984
Add param to api docs for verbose build output Upstream-commit: d0c73c28df5627bc7158fd54860f6751b4dab0f9 Component: engine
Michael Crosby2013-07-12 06:22:56 -09:00
6ed4740f8b
Merge pull request #1197 from crosbymichael/buildfile-doc-ordering
Victor Vieux2013-07-12 05:27:47 -07:00
5d09c440fb
Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
Victor Vieux2013-07-12 05:07:25 -07:00
e7310096d4
Merge pull request #1102 from dotcloud/1098-store_hostconfig_tmp
Victor Vieux2013-07-12 05:04:10 -07:00
318bacb03a
Merge pull request #1055 from dotcloud/list_container_processes-feature
Victor Vieux2013-07-12 04:56:12 -07:00
ac70e7d7db
fix tests regarding the new test image Upstream-commit: a8a6848ce0c3c54d00cfcd85727546e54a4dcf7e Component: engine
Victor Vieux2013-07-12 11:54:53 +00:00
c22c23bfc2
Merge branch 'master' into list_container_processes-feature Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c Component: engine
Victor Vieux2013-07-12 11:47:27 +00:00
7bf5a45cfe
Fix buildfile tests after rebase Upstream-commit: 49044a96089487b9df075fa972e83e4c05c7fae8 Component: engine
Michael Crosby2013-07-11 15:37:26 -09:00
725d76d0d9
Hotfix: check the length of entrypoint before comparing. Upstream-commit: 71d2ff494694d7f18310c7994daa34dce33af98b Component: engine
Guillaume J. Charmes2013-07-11 17:31:07 -07:00
ba109b6d9a
fix broken docker port Upstream-commit: affe7caf78288a638df3db37d5cebb4dc7f9ff72 Component: engine
Victor Vieux2013-07-11 19:27:19 +02:00
750c01d0af
wip Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56 Component: engine
Victor Vieux2013-07-11 17:18:28 +00:00
de5cf1eef5
add debug for error in the server Upstream-commit: b7937e268fcbc529a168164fc242edc56d51094c Component: engine
Victor Vieux2013-07-11 12:21:43 +00:00
cafbcadc85
Make the TestAllocate{UDP,TCP}PortLocalhost more reliable
Louis Opter2013-07-10 18:02:41 -07:00
1aa2442604
Packaging, issue #1174: Add pure binary to docker release Upstream-commit: bf26ae03cfe38fc0fdd6f7dedd53041204df0767 Component: engine
Daniel Mizyrycki2013-07-10 17:39:00 -07:00