2e339a6cec
Merge branch 'master' into 1237-improve_docker_top-feature
...
Conflicts:
docs/sources/api/docker_remote_api.rst
Upstream-commit: c81662eae473e2b35e4e449be18cc6dfda07e4ec
Component: engine
2013-07-22 16:22:11 +00:00
3b70a407de
Merge pull request #1244 from dotcloud/1020_add_variable
...
*Runtime: Add container=lxc in default env
Upstream-commit: 8ea9ccf3a7705020d939a186db43821bc4564992
Component: engine
2013-07-22 09:17:30 -07:00
7d9d3be422
fix error message when invalid directory
...
Upstream-commit: 74a2b13687787a33b0963f020f704d3cdde4b06d
Component: engine
2013-07-22 14:52:05 +00:00
e57c33a063
Merge pull request #1158 from cespare/1142-docker-add-fix
...
*Buildfile: determine a filename from a URL if the destination is a directory
Upstream-commit: 4e7f2b757e9b5c1a0960553938570bee2a54e0c6
Component: engine
2013-07-22 07:07:04 -07:00
ab81112793
Merge pull request #1259 from dsissitka/patch-3
...
*Documentation: Updated the stop command's docs.
Upstream-commit: 2bba279cf18ac3a58b59633b0c6757c03328cb10
Component: engine
2013-07-22 06:59:02 -07:00
cae7a0b314
Merge pull request #1258 from dsissitka/patch-2
...
* Documentation: Added top to the list of commands in the sidebar.
Upstream-commit: 56da77a548cb335bbb44e58bde3ffb003679c67d
Component: engine
2013-07-22 06:58:09 -07:00
e3ecb715a3
Update ADD documentation to specify new behavior.
...
Upstream-commit: c383d598809daec6bccd60bd211c10f6a4ef60b0
Component: engine
2013-07-21 23:32:06 -07:00
ed8e1bd7e6
Remove some trailing whitespace.
...
Upstream-commit: 416fdaa3d5d7b84f7e36fdfcff7153e3a38262c9
Component: engine
2013-07-21 23:32:06 -07:00
adbaef1554
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 .
Upstream-commit: 2b0ebf5d32c65276ce50fce168f32483ffb9c311
Component: engine
2013-07-21 23:32:06 -07:00
02d9506654
Test pulling remote files using ADD in a buildfile.
...
Upstream-commit: f236e62d9d288ac695129157d1753512f5cd2b0a
Component: engine
2013-07-21 23:32:01 -07:00
466341e775
Document -b none
...
Upstream-commit: 964e826a9beb69a0246ed22c7935fd86df6712e1
Component: engine
2013-07-21 18:01:52 -07:00
ca9f0f0f1d
Support completely disabling network configuration with docker -d -b none
...
Upstream-commit: 49673fc45cc5cfc15219bf1eb6eaff7621696919
Component: engine
2013-07-21 17:49:09 -07:00
edbf8f58a1
Support networkless containers with new docker run option '-n'
...
Upstream-commit: 3342bdb33184b83cac66921807c5403168d13f6b
Component: engine
2013-07-21 17:11:47 -07:00
52d2580351
Updated the stop command's docs.
...
Upstream-commit: 1d02a7ffb63915055f5fd9bda420bd08a8679da1
Component: engine
2013-07-21 19:00:18 -04:00
d051cf7ec4
Added top to the list of commands in the sidebar.
...
Upstream-commit: 788935175e8500b451a844f6971ac62dd099bdfc
Component: engine
2013-07-21 18:30:51 -04:00
885edf50ba
Fixed a couple of minor syntax errors.
...
Upstream-commit: 32663bf431b64d1169509bacba36e3c90e131b44
Component: engine
2013-07-20 21:27:55 -04:00
c07ca04b62
make docker run handle SIGINT/SIGTERM
...
Upstream-commit: df86cb9a5c949530336b43100b303876f07c69ba
Component: engine
2013-07-20 13:47:13 +03:00
9c4e7803c8
Merge pull request #1242 from dotcloud/remove_usage_from_test
...
remove usage from tests
Upstream-commit: e3be2e959bb4729d25e44cb25bf4e8bf733d8d89
Component: engine
2013-07-19 14:07:24 -07:00
d5db6e05ee
add container=lxc in default env
...
Upstream-commit: 67f1e3f5ed4d3061e07e910e28ac866b7bb13e18
Component: engine
2013-07-19 17:22:16 +00:00
a8e35fc588
Merge pull request #1235 from metalivedev/cleandocbld
...
Make docs build without warnings or errors. Minor additional cleanup.
Upstream-commit: 23ea9b8968b5c79760e5dbe4e6e92e1e05fe7361
Component: engine
2013-07-19 09:44:53 -07:00
744c5e7658
add LXC version to docker info in debug mode
...
Upstream-commit: 921c6994b1ad41c940bdb08732225b8db74b68f2
Component: engine
2013-07-19 16:36:23 +00:00
6e52a096e9
remove usage from tests
...
Upstream-commit: ea1258852493a83754553163db1db52a72ffb8fc
Component: engine
2013-07-19 15:56:00 +00:00
1ef21555e9
Make the ENTRYPOINT example work
...
The incantation listed in the ENTRYPOINT example didn't actually pass the arguments to your script. Changing the definition to an array fixes this.
Upstream-commit: e8ad82f9ba126414e1813fadfb17167a34afa8d4
Component: engine
2013-07-19 10:11:21 -05:00
c311fa3aa0
rebase master
...
Upstream-commit: 2e0e455fa696db7a16a08b6c7dd2def7c5ff837f
Component: engine
2013-07-19 14:48:32 +00:00
f380201be8
fix error in utils tests
...
Upstream-commit: 2e3b660dd0d49dc78f4c486e952ea6db9c007d6a
Component: engine
2013-07-19 13:56:36 +00:00
c5cd9cfc76
Merge pull request #1211 from dotcloud/new_logs
...
*Runtime: Logs are now synchronised
Upstream-commit: 0bd534adcf0933d19540506f790d00d8d1cb23d4
Component: engine
2013-07-19 06:43:29 -07:00
1b1ac70ce1
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.
Upstream-commit: 25be79208a1473a65be883989ae49b7c71081a83
Component: engine
2013-07-19 16:03:45 +03:00
59b7a438c9
docs - add example for cidfile
...
Upstream-commit: 2a3b91e3b66c48c6a26dbd673957a46c1afacbbe
Component: engine
2013-07-19 16:03:45 +03:00
ce2e737919
docs - add cidfile flag to run docs
...
Upstream-commit: 221ee504aa06d06eb868898cca2fcc020a861e84
Component: engine
2013-07-19 16:03:45 +03:00
3498daf9b5
add support for container ID files (a la pidfile)
...
Upstream-commit: 64e74cefb746caa7f2a581149bbd523dd1ac9215
Component: engine
2013-07-19 16:03:45 +03:00
797b7b513b
bump api version to 1.4
...
Upstream-commit: eb4a0271fbb7318a7d66911ccd388c048db0c2fa
Component: engine
2013-07-19 10:34:55 +00:00
37e3d486fa
add ps args to docker top
...
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
31b43ff70e
add regression test from @crosbymichael
...
Upstream-commit: 2b5386f039b5c99cf0f64fb3091cc14e4446dc64
Component: engine
2013-07-19 03:01:39 +00:00
a6f1fb98b1
fix overwrites EXPOSE
...
Upstream-commit: a0eec14c7da5b213302c2675801aaf788e84efed
Component: engine
2013-07-19 02:47:35 +00:00
7bd70e19f4
Make docs build without warnings or errors. Minor additional cleanup.
...
Upstream-commit: 54f9cdb0c30ef7d192c4ae59c669a7a5fd7d1003
Component: engine
2013-07-18 19:04:51 -07:00
148c813e5f
Merge pull request #1207 from crosbymichael/819-use-persistent-volume
...
* Runtime: Do not overwrite container volumes from config
Upstream-commit: d6fb313220c2275c4e76f6191905fb382e54a58d
Component: engine
2013-07-18 18:51:00 -07:00
c1964bd08e
Merge pull request #1232 from dotcloud/1217-testing-coverage
...
Testing, issue #1217 : Add coverage testing into docker-ci
Upstream-commit: 0aa2470c768934875d9b0a765fc82813950b9ad4
Component: engine
2013-07-18 14:27:37 -07:00
9c8c35f4bd
handle -dev
...
Upstream-commit: 0afed3eded0950b5899729714fb11d6a7322301e
Component: engine
2013-07-18 20:56:41 +00:00
0089cd0195
Merge branch 'master' into add_last_version-feature
...
Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414
Component: engine
2013-07-18 20:51:31 +00:00
325ed80b66
switch version to -dev
...
Upstream-commit: 0089dd05e910852d5b821074c73287e730040630
Component: engine
2013-07-18 20:50:04 +00:00
d7ec6adcd6
Merge pull request #1227 from dotcloud/bump_0.5.0
...
Bump to 0.5.0
Upstream-commit: 51f6c4a7372450d164c61e0054daf0223ddbd909
Component: engine
2013-07-18 11:51:29 -07:00
3427bb07af
documentation.
...
Upstream-commit: cd209f406e889feaba50103e5ce50f7dcd23767a
Component: engine
2013-07-18 14:22:49 -04:00
e4606d6f3f
Merge pull request #1226 from metalivedev/easydockerfile
...
Make dockerfile docs easier to find. Clean up formatting.
Upstream-commit: f4eaec3e1e85dd8774e0b00082d31188f55f4de2
Component: engine
2013-07-18 10:14:22 -07:00
608601a191
change -b -> -v and add udp example
...
Upstream-commit: b083418257edbcb769dd1bf9a6a3dafd334d5969
Component: engine
2013-07-18 16:25:14 +00:00
093a55ab02
Merge pull request #1169 from crosbymichael/buildfile-tests
...
Add unit tests for buildfile config instructions
Upstream-commit: 5794857f7ad9e3d84e2c549253c072d076d702cb
Component: engine
2013-07-18 08:35:23 -07:00
1df4154799
Add unit tests for buildfile config instructions
...
Add tests for instructions in the buildfile that
modify the config of the resulting image.
Upstream-commit: e7f3f6fa5a10f890a1774a2320d31e236af56be9
Component: engine
2013-07-18 05:37:28 -09:00
e1b72763dc
add debug and simplify docker logs
...
Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085
Component: engine
2013-07-18 13:29:40 +00:00
9423c7f84d
add legacy support
...
Upstream-commit: a926cd4d880904258e01ea521ecd9e1b908f2b97
Component: engine
2013-07-18 13:25:47 +00:00
97e62e30e8
Make dockerfile docs easier to find. Clean up formatting.
...
Upstream-commit: aa5671411b727d7142c289b5c1b473209aeaf630
Component: engine
2013-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
2013-07-17 17:13:34 -07:00
