Victor Vieux
494b575213
Merge pull request #1255 from dsissitka/patch-1
...
Fixed a couple of minor syntax errors.
2013-07-22 06:45:25 -07:00
dsissitka
32663bf431
Fixed a couple of minor syntax errors.
2013-07-20 21:27:55 -04:00
Guillaume J. Charmes
e3be2e959b
Merge pull request #1242 from dotcloud/remove_usage_from_test
...
remove usage from tests
2013-07-19 14:07:24 -07:00
Andy Rothfusz
23ea9b8968
Merge pull request #1235 from metalivedev/cleandocbld
...
Make docs build without warnings or errors. Minor additional cleanup.
2013-07-19 09:44:53 -07:00
Victor Vieux
ea12588524
remove usage from tests
2013-07-19 15:56:00 +00:00
Victor Vieux
6e2e4cad73
Merge pull request #1204 from dotcloud/tests-less-copypaste
...
Hack: use helper functions in tests for less copy-pasting
2013-07-19 07:55:04 -07:00
Victor Vieux
2e0e455fa6
rebase master
2013-07-19 14:48:32 +00:00
Victor Vieux
d93742fe9a
Merge pull request #1239 from dotcloud/fix_utils_tests
...
fix error in utils tests
2013-07-19 06:59:07 -07:00
Victor Vieux
2e3b660dd0
fix error in utils tests
2013-07-19 13:56:36 +00:00
Victor Vieux
0bd534adcf
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
2013-07-19 06:43:29 -07:00
Victor Vieux
e59dd2c62c
Merge pull request #1159 from unclejack/add_container_id_file_to_run
...
*Client: Add support for container ID files (a la pidfile)
2013-07-19 06:11:22 -07:00
unclejack
25be79208a
create the cidfile before creating the container
...
This change makes docker attempt to create the container ID file and
open it before attempting to create the container. This avoids leaving
a stale container behind if docker has failed to create and open the
container ID file.
The container ID is written to the file after the container is created.
2013-07-19 16:03:45 +03:00
unclejack
2a3b91e3b6
docs - add example for cidfile
2013-07-19 16:03:45 +03:00
unclejack
221ee504aa
docs - add cidfile flag to run docs
2013-07-19 16:03:45 +03:00
unclejack
64e74cefb7
add support for container ID files (a la pidfile)
2013-07-19 16:03:45 +03:00
Andy Rothfusz
54f9cdb0c3
Make docs build without warnings or errors. Minor additional cleanup.
2013-07-18 19:04:51 -07:00
Guillaume J. Charmes
d6fb313220
Merge pull request #1207 from crosbymichael/819-use-persistent-volume
...
* Runtime: Do not overwrite container volumes from config
2013-07-18 18:51:00 -07:00
Daniel Mizyrycki
0aa2470c76
Merge pull request #1232 from dotcloud/1217-testing-coverage
...
Testing, issue #1217 : Add coverage testing into docker-ci
2013-07-18 14:27:37 -07:00
Victor Vieux
edc68f84f3
Merge pull request #1230 from dotcloud/switch_dev
...
switch version to -dev
2013-07-18 13:50:40 -07:00
Victor Vieux
0089dd05e9
switch version to -dev
2013-07-18 20:50:04 +00:00
Victor Vieux
51f6c4a737
Merge pull request #1227 from dotcloud/bump_0.5.0
...
Bump to 0.5.0
2013-07-18 11:51:29 -07:00
Andy Rothfusz
f4eaec3e1e
Merge pull request #1226 from metalivedev/easydockerfile
...
Make dockerfile docs easier to find. Clean up formatting.
2013-07-18 10:14:22 -07:00
Victor Vieux
b083418257
change -b -> -v and add udp example
2013-07-18 16:25:14 +00:00
Victor Vieux
5794857f7a
Merge pull request #1169 from crosbymichael/buildfile-tests
...
Add unit tests for buildfile config instructions
2013-07-18 08:35:23 -07:00
Michael Crosby
e7f3f6fa5a
Add unit tests for buildfile config instructions
...
Add tests for instructions in the buildfile that
modify the config of the resulting image.
2013-07-18 05:37:28 -09:00
Victor Vieux
1b0fd7ead3
add debug and simplify docker logs
2013-07-18 13:29:40 +00:00
Victor Vieux
a926cd4d88
add legacy support
2013-07-18 13:25:47 +00:00
Andy Rothfusz
aa5671411b
Make dockerfile docs easier to find. Clean up formatting.
2013-07-17 18:56:40 -07:00
Victor Vieux
f8dfd0aa5e
Merge pull request #1225 from dotcloud/hotfix_docker_rmi
...
*Runtime: improve docker rmi via id
2013-07-17 14:31:56 -07:00
Andy Rothfusz
3dbf9c6560
Merge pull request #1219 from metalivedev/docs-repoupdate
...
Update docs with 0.5 repository information.
2013-07-17 13:53:12 -07:00
Guillaume J. Charmes
de563a3ea3
Merge pull request #1194 from crosbymichael/build-verbose
...
* Builder: Add verbose output to docker build
2013-07-17 12:53:06 -07:00
Victor Vieux
9cf2b41c05
change rm usage in docs
2013-07-17 19:24:54 +00:00
Victor Vieux
f310b875f8
Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
2013-07-17 19:23:06 +00:00
Solomon Hykes
ac14c463d5
Changed date on changelog
2013-07-17 11:51:26 -07: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
5231bf3653
Merge pull request #1222 from lopter/master
...
Always stop the opposite goroutine in network_proxy.go (closes #1213 )
2013-07-17 11:40:33 -07:00
Solomon Hykes
8af945f353
Small changes in changelog wording
2013-07-17 11:39:38 -07:00
Ken Cochrane
d0e8ca1257
updated with notes from @vieux
2013-07-17 13:46:11 -04:00
Victor Vieux
5a934fc923
fix docker rmi via id
2013-07-17 15:48:53 +00:00
Louis Opter
c766d064ac
Always stop the opposite goroutine in network_proxy.go ( closes #1213 )
2013-07-17 01:05:11 -07:00
Andy Rothfusz
0356081c0a
Update repository information.
2013-07-16 17:04:41 -07:00
Daniel Mizyrycki
6e8bfc8d12
Testing, issue #1217 : Add coverage testing into docker-ci
2013-07-16 13:45:43 -07:00
Guillaume J. Charmes
18e91d5f85
Update docs
2013-07-16 10:14:21 -07:00
Guillaume J. Charmes
1004d57b85
Hotfix: make sure ./utils tests pass
2013-07-15 17:58:23 -07:00
Nick Stinemates
f9e4ef5eb0
Merge pull request #1210 from dotcloud/improve_configmerge
...
improve mergeconfig, ...
2013-07-15 18:04:12 -07:00
Guillaume J. Charmes
eefbadd230
Merge -b and -v options
2013-07-15 17:51:32 -07:00
Guillaume J. Charmes
bc21b3ebf0
Bump version to 0.5.0
2013-07-15 14:57:52 -07:00
Solomon Hykes
608fb2a21e
Merge pull request #1184 from dotcloud/1176-packaging-release
...
Hack: document PPA release step
2013-07-15 13:59:55 -07:00
Michael Crosby
92cbb7cc80
Do not overwrite container volumes from config
...
Fixes #819 Use same persistent volume when a container is restarted
2013-07-15 11:59:11 -09:00
Solomon Hykes
45050d9887
Merge pull request #1188 from dotcloud/1174-packaging-binary
...
Packaging: add pure binary to docker release
2013-07-15 13:59:06 -07:00
