Commit Graph

743 Commits

Author SHA1 Message Date
85a2b99bef Add a progress bar to docker pull
Upstream-commit: b64dfdd8cd636c5138dbd700f60e41651bae3e15
Component: engine
2013-03-31 13:04:41 -07:00
fa190ee6b5 Revert regression introduced in 81eac415ad03d93596a0d8da92bdccd9ecd4ee63, which caused 'docker run -i' to never close stdin
Upstream-commit: a6779bcae2df4805b8024c56f81ee3afac46ff93
Component: engine
2013-03-31 02:44:56 -07:00
cd7f78f436 Bumped version to 0.1.1
Upstream-commit: 8293a0d53350b9ebb584988efe3096c313a13ad4
Component: engine
2013-03-31 02:18:04 -07:00
6d568468b4 Show shorthand container IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup containers
Upstream-commit: 0b9a3c86a26b4b7eb463a6c73cb030bc851fdd64
Component: engine
2013-03-31 02:02:01 -07:00
f04b20d695 Merge remote-tracking branch 'origin/125-reattach_attached_run_command-fix'
Upstream-commit: 5a2a044e2484bd0fa8f41a35d8773a99bdf89734
Component: engine
2013-03-31 00:20:31 -07:00
11d54ca9a7 Add debug infos in CmdInfo to know the amount of fds and goroutines in use
Upstream-commit: 99f9b697165f1f081499b45b7789508dcf0c2553
Component: engine
2013-03-30 10:33:10 -07:00
6b5466d566 Make sure to close all pipes when detaching client (#228)
Upstream-commit: b336d928febc0f9212d56b28430bbdf37d2cfcda
Component: engine
2013-03-30 09:47:09 -07:00
10d17433d1 Close the containers stdin when the process dies
Upstream-commit: 47607494027be3d37cbb01a07e026e99f9c5151b
Component: engine
2013-03-30 09:08:53 -07:00
4a407f8199 Fix a scope issue preventing the close of slave stdin pty (#228)
Upstream-commit: 7efde5eb8350ad709608e619b01af4108cc9d567
Component: engine
2013-03-30 09:07:54 -07:00
8e072eedc0 Store the master ptys in order to close them when the process dies (#228)
Upstream-commit: 5252ab697c927d7b51109a1bb1a68d6a3dfc88b3
Component: engine
2013-03-30 09:05:53 -07:00
20eb720046 Merge pull request #269 from cespare/gofmt-1
Gofmt.
Upstream-commit: 41555f67e077a2d8e91ba565fdc215020bd1700b
Component: engine
2013-03-30 12:46:47 -07:00
80191382f5 Add unit test for the #125 scenario. Reattach after client disconnect on stdin allocated container
Upstream-commit: 8cceafc8348f8e9de71b09274458848cd8e8de6d
Component: engine
2013-03-30 06:55:47 -07:00
b7d3dd1f64 Gofmt.
Upstream-commit: 2d4c5ddbdd3258dfd079e3e1f38253e4e6e5a16b
Component: engine
2013-03-29 23:58:30 -07:00
7d7b9e2369 Merge remote-tracking branch 'robryk/cmdstream-deadlock'
Upstream-commit: d1ed28cb941578b07420a507886ddebaed78deb8
Component: engine
2013-03-29 23:43:02 -07:00
06b3a9272b Merge remote-tracking branch 'origin/improve_container_tests'
Upstream-commit: 7dbb1eacc19d8393ad714866b3e3682bc23ca0dd
Component: engine
2013-03-29 23:41:09 -07:00
c03f7d98ac Added a timeout to TestCmdStreamLargeStderr.
Upstream-commit: 68278b66c5294690d051d6a0fe157e2b965d7b1a
Component: engine
2013-03-29 22:36:36 +01:00
c6d73bb803 Merge remote-tracking branch 'robryk/bufreader-race'
Upstream-commit: f483b214bb3e1f2586e5caca61e3c8384f0ad2e4
Component: engine
2013-03-29 13:50:33 -07:00
b6985fe801 Merge pull request #250 from metachord/master
Remove unnecessary path parts
Upstream-commit: f5b458b1dc898862609ad5aadea7321cbec582c6
Component: engine
2013-03-29 13:42:23 -07:00
7e0d305381 FIXME: implement a timeout in TestCmdStreamLArgStderr to avoid blocking the whole test suite when it fails
Upstream-commit: f7b4f0c19329bcf13b0df5408e2bc9eac89e9f44
Component: engine
2013-03-29 13:37:52 -07:00
f890496d6d Comment CmdStream a little bit to facilitate future fixes and contributions
Upstream-commit: 6ede6bc8f2c1cd465fd48120d42aa39853b51111
Component: engine
2013-03-29 13:26:02 -07:00
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
2944ce91cb Add unit test for multiple attach / restart
Upstream-commit: 0ebdca5e6144b0176a4b161cb1bd40efc0dc7efe
Component: engine
2013-03-29 10:56:49 -07:00
1a59c7319b Do not close the stdin of the process when the client deattaches himslef
Upstream-commit: 81eac415ad03d93596a0d8da92bdccd9ecd4ee63
Component: engine
2013-03-29 09:42:42 -07:00
002d37a1c9 Fix #108, reattach now works properly
Upstream-commit: 0b2eee8b33448c27c4d2b29b995a56ce3a411963
Component: engine
2013-03-29 09:31:47 -07:00
3f6c2c9af6 Merge pull request #265 from dotcloud/formating_debug_harmonize
Formating debug harmonize
Upstream-commit: d0d5d5ff094a5c03a6b13a18394108cda126eef2
Component: engine
2013-03-29 21:30:43 -07:00
c78aa90b5a Merge pull request #266 from dotcloud/do_not_log_stopped_container
Do not log non-running containers
Upstream-commit: 57dfca052b47ae6daf6d0c54e68907a025f9ec8e
Component: engine
2013-03-29 21:29:19 -07:00
38462f5f51 Add comments in graph.go
Upstream-commit: 99b36c2c326ccc11e726eee6ee78a0baf166ef96
Component: engine
2013-03-29 21:13:59 -07:00
6a1fd378c7 Merge remote-tracking branch 'origin/264-remove_cmdAttach_option'
Upstream-commit: b013d937869372a352387d3441f1c36428f958c3
Component: engine
2013-03-29 20:30:43 -07:00
57259fb9c3 Merge remote-tracking branch 'lopter/master'
Upstream-commit: b1fa21aa0ee9326ad6e3c0f32b80f5905995427a
Component: engine
2013-03-29 20:17:33 -07:00
69a838f359 Fix output in the login command
It was broken because the terminal is in raw mode.

This changeset adds code in the login commmand to do a little bit of
interpretation on the user input (something usually done by the terminal
emulator itself).
Upstream-commit: 9740102990b059d014fad5f8652306cf7ff62d94
Component: engine
2013-03-29 11:39:41 -07:00
0ccd58f712 Do not log non-running containers
Upstream-commit: 0f7a4534c16cda07344a7231d6012268f4aa53aa
Component: engine
2013-03-29 08:46:06 -07:00
38f2e38ea3 Remove unused variable from container struct
Upstream-commit: 7a565a0479b6a797a0cdc9a4156e57ce811032b3
Component: engine
2013-03-29 08:41:48 -07:00
a659bdb4eb Add some error checking in container monitor
Upstream-commit: 69c2250ec2fd23dc9d31372cb433b7c18a917d09
Component: engine
2013-03-29 08:29:59 -07:00
2588801f2a Harmonize the error management. Use fmt.Errorf instead of errors.New
Upstream-commit: d17f78c373d5d8cd015626c7972e0e2365eab2a7
Component: engine
2013-03-29 08:19:42 -07:00
f235c36167 Add debug infos
Upstream-commit: ccac5b138253ab87846089cb5af9b4b77a7fd9d5
Component: engine
2013-03-29 08:18:43 -07:00
c96ec675c0 Remove the options of CmdAttach
Upstream-commit: 9442d6b349295818d9a0ddecc10ca19019ead935
Component: engine
2013-03-29 07:49:26 -07:00
84436a6982 Improve the containers unit tests (add error checking)
Upstream-commit: 232dbb186416df290fc698e92b3a120b92497559
Component: engine
2013-03-29 07:44:58 -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
2db6acd48b Fix a race condition in bufReader.
The race condition cen be detected by running existing bufReader tests
with Go's race detector.
Upstream-commit: d52451bcf887790df5a6a7cbbc7305747535eb11
Component: engine
2013-03-29 11:00:50 +01:00
2c32113c8a Remove unnecessary part of paths to lxc executables
Upstream-commit: 6d72758f1268f710be635cb16ef8e001fc6516a5
Component: engine
2013-03-29 12:07:25 +07: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