44017879ad
Add a TestRunExit, make sure cmdRun returns after process dies
...
Upstream-commit: 43484e8b502be1dbf2e587524ae8ef036181b186
Component: engine
2013-04-02 09:22:30 -07:00
693692b24b
Implementing dirty git checkout indicator
...
Upstream-commit: 5471f5b2ee4bd637147a1ea1dce716670b50796d
Component: engine
2013-04-02 09:58:19 -05:00
7e0b5d8ac6
variable names
...
Upstream-commit: 02c211a0dca91bb3744b6c1301e372799189881f
Component: engine
2013-04-02 07:13:42 -07:00
5e064a959a
More thorough test case, use container.Stop() instead of lxc-kill,
...
use setStopped() during the restore step
Upstream-commit: c780ff5ae726bc8acd30b9ef476cd111c477ec35
Component: engine
2013-04-02 07:01:43 -07:00
058965deb1
Merge branch 'master' into 257-container_real_running_state-fix
...
Upstream-commit: 8edf0ca7f35c54ed0184ed0b7e086f1bd8ce5e63
Component: engine
2013-04-02 06:37:50 -07:00
e2ff0716cb
Merge pull request #317 from dotcloud/307-loginfix
...
Fix for #307
Upstream-commit: 927308cfd94832308bd409276e3f786972d3ef5a
Component: engine
2013-04-02 03:01:23 -07:00
3421949564
Fix for #307
...
Upstream-commit: 8fed600077d5b8d976adec27dfb822166ca7baa5
Component: engine
2013-04-02 03:00:21 -07:00
450827385c
Renamed writeBroadcaster.Close() to CloseWriters().
...
Upstream-commit: a83d87abd442dda5f2d67a2701aae9c7b891e68a
Component: engine
2013-04-02 10:45:17 +02:00
f7fc21bc5d
Refactored CmdRun and CmdAttach to use Container.Attach
...
Upstream-commit: c808940c041ca8c7f9f9c5e0fa93e37ebfdd412a
Component: engine
2013-04-01 23:52:20 -07:00
38ad5f3006
Fixed a lot of language and small things.
...
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
2013-04-01 19:11:09 -07:00
e2d87791af
Merge pull request #288 from titanous/expand-contributing
...
Expand the contributing guidelines
Upstream-commit: 3478d6f7061e0d71c040fd8f7ba9b51bf00907c3
Component: engine
2013-04-01 18:45:18 -07:00
97cc7d17c5
Merge pull request #312 from sa2ajj/devenv-doc-fix
...
fix code block formatting
Upstream-commit: 13b63091385262a595be011890c6a196c91125a4
Component: engine
2013-04-01 18:40:29 -07:00
cadfddb770
fix code block formatting
...
Upstream-commit: 90db9e751750e62ea701843491774323ef20ab06
Component: engine
2013-04-02 04:35:54 +03:00
7a184f8e80
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Upstream-commit: f15889461d6aeebfb06835823ed67266a6d9042f
Component: engine
2013-04-01 18:11:46 -07:00
57d6ae86a7
Merge pull request #286 from titanous/285-close-bodies
...
Close HTTP response bodies
Upstream-commit: dea4194f8b3f93d5806f5fbe34f8839f49ede0ef
Component: engine
2013-04-01 17:59:22 -07:00
cab6cd5ccd
Merge pull request #305 from fsouza/master
...
Makefile: simplify "fmt" target
Upstream-commit: e331f1ee0e3333c62f9e04e9deac060e8ea01953
Component: engine
2013-04-01 16:28:29 -07:00
a700cb8847
use xz compression when pushing images to the registry
...
This makes the xz compression the default.
Upstream-commit: 0ddc6867fb86d2539bb19034844ac8c2369060c1
Component: engine
2013-04-02 02:19:34 +03:00
c1d869bdb5
add support for xz compression
...
This adds xz as a compression option.
xz is alread supported by bsdtar without the external xz program.
Upstream-commit: 3c5d2e4661e76e83e35637561153578ddd87f249
Component: engine
2013-04-02 02:16:28 +03:00
45a54423e7
Images can be removed by short-hand ID. Solves #306 .
...
Upstream-commit: ff5cb8e864b87d3976b368ae544010f5736d1da2
Component: engine
2013-04-01 16:04:44 -07:00
9c0eadc435
Add test to reproduce issue #306
...
Upstream-commit: 7ad2e022fb737286b5803066bde6919e2d544c4e
Component: engine
2013-04-01 16:02:02 -07:00
21d5e7b3d6
add host name parameter to "run" command
...
fixes #243
Upstream-commit: f65fc1e766cefed06131acf1ede6bb1f25f75fff
Component: engine
2013-04-02 01:26:17 +03:00
21949938ee
make complex options to stand out
...
Upstream-commit: dcc9dfb27d49c7e7f58e04bf5656656f69e76fe1
Component: engine
2013-04-02 01:26:17 +03:00
4c1daebf6d
makefile: simplify "fmt" target, and include -s flag
...
Upstream-commit: 650dff73bdd48058ec0186cbda90683ff2287df0
Component: engine
2013-04-01 18:50:25 -03:00
45293ca626
Merge pull request #304 from paulhammond/mkimage-busybox-fixes
...
Fix mkimage-busybox
Upstream-commit: 6d001450766aa2067e0a2039c88bc359647b61a1
Component: engine
2013-04-01 14:38:00 -07:00
75a146bba9
Fix mkimage-busybox
...
Upstream-commit: cc2558bf10817b086fcb9783474d47db24d2cb3a
Component: engine
2013-04-01 14:34:12 -07:00
a9b7db02e4
Shortening the git commit used in the version command
...
Upstream-commit: e566b89a5f13f36fad2e2bb37faf9079e06e051e
Component: engine
2013-04-01 16:31:33 -05:00
c43539098b
Merge remote-tracking branch 'origin/progress_bar_push_pull'
...
Upstream-commit: 47c4c2abd42d06d14d28f894b4ba980d61f94f5c
Component: engine
2013-04-01 13:49:07 -07:00
5d71af1ed4
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: fa5bb5acf1ed847f8645284b48faa311162ddce1
Component: engine
2013-04-01 13:44:19 -07:00
464ac2f144
Merge pull request #300 from cespare/make-fmt
...
Add a 'fmt' target to the Makefile.
Upstream-commit: 50500cfcb6824286e43b5f5f2b7b58399f083138
Component: engine
2013-04-01 13:41:53 -07:00
91936db4ba
Merge pull request #301 from dotcloud/container_test_improvment-1
...
Avoid destroy() timeout by closing stdin in TestStart()
Upstream-commit: 9e81ab65cb2866fff282681d6159698abcee5635
Component: engine
2013-04-01 13:36:02 -07:00
8d2e25b6d1
Merge pull request #298 from cespare/cleanup-1
...
Some style, text, and comment cleanup.
Upstream-commit: ff26493fd5ac1205e5f9d23b976e759730a3229c
Component: engine
2013-04-01 13:26:40 -07:00
741a443d40
Add a 'fmt' target to the Makefile.
...
A convenience for gofmting all the code, including subpackages.
Upstream-commit: 9b13d21fc980b5ac12e035d9c8cbe3ef2c36a079
Component: engine
2013-04-01 13:05:00 -07:00
4d479797e6
Don't use an interface{} where a string will do.
...
Upstream-commit: 887f509d1dd2a5e34fbfb19ccd2c4b1eb3127dbd
Component: engine
2013-04-01 12:56:59 -07:00
c5d25049cd
A few spelling/grammar corrections.
...
Upstream-commit: 13d2b086386196e9f4f03e4a18d508a65f6fc5ff
Component: engine
2013-04-01 12:56:50 -07:00
2ac307781e
Use a *println or *print function instead of *printf where appropriate.
...
Upstream-commit: c298a91f95dafb056cede9036f5e81f259b8f3e9
Component: engine
2013-04-01 12:17:00 -07:00
5f6e565b52
Adding git commit to the version output
...
The Makefile must be used in order to inject the git commit
via -ldflags.
Upstream-commit: 37a78902db9e968d307d0c0325612e8bef20bc69
Component: engine
2013-04-01 13:52:45 -05:00
1ceba2a123
Don't convert []byte to string unnecessarily.
...
Upstream-commit: 15b30881570369564bde3f7d8faf4491b2ebfaab
Component: engine
2013-04-01 11:15:40 -07:00
70d73b8c8b
Don't use a strings.Reader where a bytes.Reader will do.
...
There are several places where a []byte is converted to a string
and then fed into strings.NewReader().
Upstream-commit: 7830cf91663f071315c3d0406bc3de0f8a58c2b6
Component: engine
2013-04-01 11:15:10 -07:00
819ad2b9f0
Expand the contributing guidelines
...
Upstream-commit: 321d94b17e0b23754cb8c5858c11bef554ec8279
Component: engine
2013-04-01 12:35:04 -04:00
953809e9d0
Close HTTP response bodies
...
Fixes #285 .
Upstream-commit: 6b59cc8a1031d78530efb7582c936ba8221da847
Component: engine
2013-04-01 09:51:56 -04:00
875003ed92
Avoid destroy() timeout by closing stdin in TestStart()
...
Upstream-commit: 91b1f9eee9729fc9845eaecdad88a7a5050a33de
Component: engine
2013-03-31 22:42:10 -07:00
49ffe42eb3
Merge pull request #238 from johncosta/42-contribution-guidelines
...
Contribution guidelines
Upstream-commit: c9a13147fe98c8b5b55eb28deca8147f10906012
Component: engine
2013-03-31 22:14:18 -07:00
28343696b9
Show shorthand image IDs for convenience. Shorthand IDs (or any non-conflicting prefix) can be used to lookup images
...
Upstream-commit: 1632566ecb133fb0853aec6715c5c06a4a9e41da
Component: engine
2013-03-31 22:11:55 -07:00
bd2e319579
Temporarily disable a broken test (waiting for @creack to fix it), and silence a warning which pollutes unit tests but is complicated to fix
...
Upstream-commit: a52a28b60946463e8208b8cd5d737ba79f23a8b8
Component: engine
2013-03-31 22:05:14 -07:00
a591bf3f3d
gofmt
...
Upstream-commit: 54443c092caf9c1e11c47ea30400084d009af6e9
Component: engine
2013-03-31 22:04:59 -07:00
2e91f0bb47
Add unit test for CmdAttach
...
Upstream-commit: ad1e8a9b0f0e57327d71827c1161c21f48910e42
Component: engine
2013-03-31 21:48:18 -07:00
2afab98d61
Merge pull request #272 from dominikh/improve/lazy-ip-allocator
...
Make IP allocator lazy
Upstream-commit: 29b7ecb0177164c148498b1a2fd7b9124ae7741a
Component: engine
2013-03-31 21:04:35 -07:00
8a40ce58f3
Make IP allocator lazy
...
Instead of allocating all possible IPs in advance, generate them as
needed.
A loop will cycle through all possible IPs in sequential order,
allocating them as needed and marking them as in use. Once the loop
exhausts all IPs, it will wrap back to the beginning. IPs that are
already in use will be skipped. When an IP is released, it will be
cleared and be available for allocation again.
Two decisions went into this design:
1) Minimize memory footprint by only allocating IPs that are actually
in use
2) Minimize reuse of released IP addresses to avoid sending traffic to
the wrong containers
As a side effect, the functions for IP/Mask<->int conversion have been
rewritten to never be able to fail in order to reduce the amount of
error returns.
Fixes gh-231
Upstream-commit: 6f9a67a7c7cb717ad1a575df3e4c0fd2ec8bc651
Component: engine
2013-04-01 06:02:44 +02:00
735e80ee9b
Change the commands unit tests in order to reflect the proper behaviour of CmdRun
...
Upstream-commit: cfeed391d76105e4131a021d2005966d01eb4e68
Component: engine
2013-03-31 20:52:35 -07:00
75fa1b8a06
Working in progress: add unit tests for the running state check
...
Upstream-commit: 8c36e6920a9e17171dc67a79ab20d39886404e73
Component: engine
2013-03-31 20:14:54 -07:00
