2fd3cec407
Merge remote-tracking branch 'robryk/cmdstream-deadlock'
...
Upstream-commit: fdae64d8d77dec092c8e5efc55c05057639b0170
Component: engine
2013-03-29 13:20:17 -07:00
b3fc1dd176
Comment to explain CmdStream
...
Upstream-commit: f85e6548c79648b8bcff8ee83142983bbb15dacb
Component: engine
2013-03-29 13:18:59 -07:00
e3924816a0
Merged Ctrl-C interception by @creack
...
Upstream-commit: c937e237ad0625fc0ae8049e745bf599c27b0af8
Component: engine
2013-03-29 13:12:04 -07:00
ddfd49ddce
Fix a deadlock in CmdStream.
...
As per FIXME, CmdStream could have deadlocked if a command printed
enough on stderr. This commit fixes that, but still keeps all of
the stderr output in memory.
Upstream-commit: 58befe3081726ef74ea09198cd9488fb42c51f51
Component: engine
2013-03-29 12:55:48 +01:00
84af23bd19
Fixed leftover from docs merge. Thanks @cespare for spotting!
...
Upstream-commit: 1d6929c8bc6cbc5ad63dce083869460b6bb377ad
Component: engine
2013-03-28 19:18:03 -07:00
8ff79b2c0d
Merging dhrp/docs
...
Upstream-commit: 48a208baf197c035c59ecd44d285fb3640107233
Component: engine
2013-03-28 19:12:58 -07:00
1a47c25086
Fixed some links in gettingstarted
...
Upstream-commit: 61cf09b2e7491295575195b616207059e7107f01
Component: engine
2013-03-28 19:03:06 -07:00
ce39132944
Merge pull request #241 from titanous/cleanup-deps
...
Remove unneeded sqlite deps from puppet and debian control
Upstream-commit: b51fe837a4992437372e18f9660c87be9ee593a8
Component: engine
2013-03-28 18:45:44 -07:00
ea281519af
Merge pull request #244 from dotcloud/docs-julien
...
Docs: Changed the url of the LEGO img to point to the one with copyright
Upstream-commit: 4e11e425467f1aac77104cc983df160b45e3da41
Component: engine
2013-03-28 18:45:20 -07:00
7f80c9c88f
Test that iptables() looks for iptables in the PATH
...
Upstream-commit: ba33d67a1a0f3310bddab8176a9d570e5d5c00e2
Component: engine
2013-03-28 18:44:47 -07:00
5d8e5c0e3c
Merge remote-tracking branch 'shawnsi/iptables-wrapper'
...
Upstream-commit: 70853785b6f04337168343d8889eba413a40ce54
Component: engine
2013-03-28 18:40:02 -07:00
a2ceb7616d
Merge remote-tracking branch 'titanous/camelize'
...
Upstream-commit: 12a65dc4a884977454e7924db4a87166f751536a
Component: engine
2013-03-28 18:23:59 -07:00
c6d2fd3579
Update AUTHORS and add .mailmap
...
Upstream-commit: 6bcc55f7d030d0cfd7bf130070805a9001951b06
Component: engine
2013-03-28 20:53:54 -04:00
3e91a54abc
Camelize some snake_case variable names
...
Upstream-commit: a6da7f138c0b260d560c63e234c87db0f5c72bb1
Component: engine
2013-03-28 20:12:23 -04:00
e2569478ab
Docs: Changed the url of the LEGO img to point to the one with copyright
...
Upstream-commit: d66de319bd1c66e04421c19e7fc25b825d94fe00
Component: engine
2013-03-28 17:09:36 -07:00
264201cac6
Merge remote-tracking branch 'origin/165-push_permission_check-fix'
...
Upstream-commit: 0636c11f0b15f8fa0693be2d3560370f19f773cf
Component: engine
2013-03-28 15:45:00 -07:00
4b29aba42a
Remove unneeded sqlite deps from puppet and debian control
...
Upstream-commit: 5dc1e66366d3a40169eec67d823f2d6209ba5b99
Component: engine
2013-03-28 18:38:53 -04:00
52aecd4a56
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docs/sources/examples/python_web_app.rst
Upstream-commit: 09910785c80822fad71127db4ec30b3de8c27f08
Component: engine
2013-03-28 12:48:32 -07:00
46acd15bd1
Handling iptables() errors more usefully during portmapper setup
...
Upstream-commit: 523803d633e3bf7e4076ad41e73daba491da5d40
Component: engine
2013-03-28 14:44:54 -05:00
de000293fa
Return error when iptables is not found
...
Upstream-commit: c66d2b6a532c657b554ffa3c80b2cf15e218ee8e
Component: engine
2013-03-28 14:30:56 -05:00
a587e006db
Added the lego illustration to the docs.docker.io 'homepage'
...
Upstream-commit: da69df5f421ed49464254fb52dc222f98587345f
Component: engine
2013-03-28 12:27:37 -07:00
b0c9bfcaf7
Changed the lego illustration on /README.md to the version which contains the copyright in the image itself.
...
Upstream-commit: 32b58159cd0eedc9d6cd05e8d78b8519c5b690c7
Component: engine
2013-03-28 12:18:22 -07:00
ef4aab72d7
Looking for iptables in PATH
...
Upstream-commit: dfc3904f778996a449ef5199e36fce6cabfb803a
Component: engine
2013-03-28 14:02:50 -05:00
7627c4db8d
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 4825d3a5374cb177642c72389d6048f34535d9c9
Component: engine
2013-03-28 11:54:33 -07:00
746cb02751
fixed some of the syntax in example
...
The example was broken, I updated it to work with latest version of code.
Upstream-commit: 5c639118d35c1c2048123e94fd4b9ff9b98c89dc
Component: engine
2013-03-28 15:51:10 -03:00
4f5f536f6e
Removed $'s from examples to make them easier to copy paste
...
Upstream-commit: 9bc7e71f16365f21c1b54ad1c16188eda668296e
Component: engine
2013-03-28 11:50:00 -07:00
81ccb33fbc
Merge remote-tracking branch 'origin/174-remove_image_twice-fix'
...
Upstream-commit: 19316955dd33eefc7f77f3c6b6591b47ba0cab82
Component: engine
2013-03-28 11:48:41 -07:00
934886e0bd
Fixed links on gettingstarted to point to the right places in docs
...
Upstream-commit: 172f746e4d80df0efd2b30ba6be540d7ec423db3
Component: engine
2013-03-28 11:44:33 -07:00
9de6b5992b
Merge remote-tracking branch 'origin/docs'
...
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
abc96f58d2
Merge remote-tracking branch 'dotcloud/master' into local/dotcloud/docs
...
Upstream-commit: 70594bdd166e41ffb26913749e83ba752f851ebd
Component: engine
2013-03-28 10:58:01 -07:00
8d4dfc89d5
Update README.md
...
Fixed typo
Upstream-commit: b3cbe87b62f00d0dcc207d4562c9dde99a708366
Component: engine
2013-03-28 02:55:28 -05:00
22d5f7d988
Change hardcoded "0" onto os.Stdin.Fd()
...
Upstream-commit: 6a236184af6ae57e2f7475e9ab279b0684a869d4
Component: engine
2013-03-27 23:56:36 -07:00
3ebc70c951
#214 Better signal handling
...
Upstream-commit: 108acc0511fde98a8b5035d9ea7256d5449bb034
Component: engine
2013-03-27 23:54:53 -07:00
338903c9fa
Remove /usr/local/bin/docker
...
Upstream-commit: fa89076673bd734cebff88717bf79461ecf8d505
Component: engine
2013-03-28 05:28:11 +00:00
91838166e9
Merge pull request #184 from titanous/simplify-vagrant
...
vagrant: Simplify provisioning to build from repo
Upstream-commit: daa7e4a2034f65197222eab94ea46e4d5a3400e7
Component: engine
2013-03-27 19:07:20 -07:00
73606e3c52
vagrant: Simplify provisioning to build from repo
...
This sets up an idiomatic Go workspace in /opt/go with the source
shared from the host directory in
/opt/go/src/github.com/dotcloud/docker and docker installed into
/opt/go
Upstream-commit: a3ab89df2b3d9ba654ba85af5d71d063d401f23f
Component: engine
2013-03-27 21:55:25 -04:00
c092632cc7
Made all paths "pretty url's" including gettingstarted.
...
Upstream-commit: 90fb5dc962650567f9872ecd17bae380b0355f72
Component: engine
2013-03-27 17:01:50 -07:00
33c9b9eb1f
Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/
...
Upstream-commit: 3b71336edcd3798a11ea8a2f9c94b012357b32c3
Component: engine
2013-03-27 16:43:13 -07:00
df3673a895
Add unit test for #174 Delete image already deleted then repulled
...
Upstream-commit: baea0a98f84f7827485505425b23ee0ac7ce2a23
Component: engine
2013-03-27 12:09:58 -07:00
fe7f976896
Merged branch sa2ajj/top-level-makefile
...
Upstream-commit: d8dc6d4583a8bbe24c889f3a7dff749e4721fe2d
Component: engine
2013-03-27 11:50:01 -07:00
1d78df9479
Merge pull request #205 from crazysim/docker-local-shared
...
Use the directory where the Vagrantfile is located for SyncFolders instead of a hard-coded "~/docker"
Upstream-commit: 7e9975d00af96e7b02244fa350d41415a3e1eeaf
Component: engine
2013-03-27 07:34:58 -07:00
c9e397a6f6
changed docker import to docker pull
...
changed docker import to docker pull, still need to make sure that the image is in the registry.
Upstream-commit: 212a044a55394f7b79f02344d5ea4ee72ed787d5
Component: engine
2013-03-27 10:44:20 -03:00
e80be7162d
change docker import to docker pull
...
change docker import to docker pull in the basecommands doc
Upstream-commit: 165a7f36709ad21d2e03c938855acf75a5a0c60a
Component: engine
2013-03-27 10:43:05 -03:00
1824784a58
Fixed typo in command description for pull
...
Upstream-commit: ff04ce3ddfc5bcd681c580b0b4e739e8c737e5b9
Component: engine
2013-03-27 10:02:11 -03:00
7930efd497
use the directory where the vagrantfile is located for mounting
...
Upstream-commit: 43213dfc4a441ca347cd97ceca219e8e021f08ef
Component: engine
2013-03-26 23:14:50 -07:00
3c193f2186
Fixed broken examples in docs
...
Upstream-commit: 4a086dfc0859fb3053925f1651d39056ef7dbfd6
Component: engine
2013-03-26 20:28:46 -07:00
9df86cc700
Merge pull request #204 from dhrp/master
...
Added amazon install path to documentation.
Upstream-commit: 6b54a439b2930ec93871c6b2e912ed0da71cfa48
Component: engine
2013-03-26 20:23:21 -07:00
e47391f32c
Merge pull request #192 from chooper/vagrant11-providers
...
Fix AWS provisioning with Vagrant
Upstream-commit: 00b81936aa5c89fae625c833c1d6a51d4d55d99a
Component: engine
2013-03-26 20:18:09 -07:00
4785d10988
Merge pull request #199 from dotcloud/smalldocs
...
Small update to docs
Upstream-commit: b2e16f941dea9e7ddd4a062b26df2a88473e5e11
Component: engine
2013-03-26 20:12:03 -07:00
3117b8a97a
Merge pull request #200 from dhrp/update-examples
...
Update examples
Upstream-commit: 72563925a1e38ba99007c56efefdd8ae4b73df4f
Component: engine
2013-03-26 20:11:07 -07:00
