Victor Vieux
8165e51ecc
Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration
2013-07-23 08:44:12 +00:00
Thatcher
9a15db21a6
Merge pull request #1269 from dhrp/new-website-links
...
Added new docker logo to the documentation header, and added other links to docs header. Tnx @keeb !
2013-07-22 20:48:29 -07:00
Thatcher Peskens
58a1c5720a
Added new docker logo to the documentation header, and added other links.
2013-07-22 20:26:40 -07:00
Stefan Praszalowicz
bc172e5e5f
Invert network disable flag and logic (unbreaks TestAllocate*PortLocalhost)
2013-07-22 19:00:35 -07:00
Solomon Hykes
6745bdd0b3
Typo in 3rd-party
2013-07-22 18:39:58 -07:00
Solomon Hykes
5714f0a74e
Hack: completed step 12 of the bootcamp
2013-07-22 18:36:36 -07:00
Solomon Hykes
ce43f4af1c
Hack: first draft of the maintainer boot camp. Work in progress!
2013-07-22 18:32:55 -07:00
Victor Vieux
5d1609f5a2
Merge pull request #1265 from dotcloud/better-bridge-defaults
...
*Network: Improve default network configuration
2013-07-22 13:54:35 -07:00
Solomon Hykes
4714f102d7
Allocate a /16 IP range by default, with fallback to /24. Try a total of 12 ranges instead of 3.
2013-07-22 12:06:24 -07:00
Guillaume J. Charmes
a675da65e9
Merge pull request #1262 from dotcloud/1253_add_directory_check
...
* Runtime: fix error message when invalid directory
2013-07-22 11:54:22 -07: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
9adba5e2e6
Merge pull request #1264 from dotcloud/fix_tests_env
...
fix test env
2013-07-22 09:26:34 -07:00
Victor Vieux
5c1af383eb
fix test env
2013-07-22 16:26:05 +00:00
Victor Vieux
8ea9ccf3a7
Merge pull request #1244 from dotcloud/1020_add_variable
...
*Runtime: Add container=lxc in default env
2013-07-22 09:17:30 -07:00
Victor Vieux
74a2b13687
fix error message when invalid directory
2013-07-22 14:52:05 +00:00
Victor Vieux
4e7f2b757e
Merge pull request #1158 from cespare/1142-docker-add-fix
...
*Buildfile: determine a filename from a URL if the destination is a directory
2013-07-22 07:07:04 -07:00
Ken Cochrane
2bba279cf1
Merge pull request #1259 from dsissitka/patch-3
...
*Documentation: Updated the stop command's docs.
2013-07-22 06:59:02 -07:00
Ken Cochrane
56da77a548
Merge pull request #1258 from dsissitka/patch-2
...
* Documentation: Added top to the list of commands in the sidebar.
2013-07-22 06:58:09 -07:00
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
Caleb Spare
c383d59880
Update ADD documentation to specify new behavior.
2013-07-21 23:32:06 -07:00
Caleb Spare
416fdaa3d5
Remove some trailing whitespace.
2013-07-21 23:32:06 -07:00
Caleb Spare
2b0ebf5d32
Buildfile: for ADD command, determine filename from URL.
...
This is used if the destination is a directory. This makes the URL
download behavior more closely match file copying.
Fixes #1142 .
2013-07-21 23:32:06 -07:00
Caleb Spare
f236e62d9d
Test pulling remote files using ADD in a buildfile.
2013-07-21 23:32:01 -07:00
Stefan Praszalowicz
964e826a9b
Document -b none
2013-07-21 18:01:52 -07:00
Stefan Praszalowicz
49673fc45c
Support completely disabling network configuration with docker -d -b none
2013-07-21 17:49:09 -07:00
Stefan Praszalowicz
3342bdb331
Support networkless containers with new docker run option '-n'
2013-07-21 17:11:47 -07:00
David Sissitka
1d02a7ffb6
Updated the stop command's docs.
2013-07-21 19:00:18 -04:00
dsissitka
788935175e
Added top to the list of commands in the sidebar.
2013-07-21 18:30:51 -04: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
Victor Vieux
67f1e3f5ed
add container=lxc in default env
2013-07-19 17:22:16 +00: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
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
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
