Commit Graph

20395 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
4f419e5924 Check if the containers are really running when starting docker
Upstream-commit: 3dcaf20d6bf912cbc3eb689302d41047f9cd0f82
Component: engine
2013-03-31 17:40:39 -07:00
0d0aacb146 Add a check to avoid double start (resulting in dockerd to panic) and unit test for it
Upstream-commit: d949e2804a35497bc041537734dfeff150ea7e21
Component: engine
2013-03-31 14:15:10 -07:00
19f7c2dca5 Add progress bar on docker push
Upstream-commit: 1fc9405537a1c528a59356ec36189a61db146701
Component: engine
2013-03-31 13:53:47 -07:00
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
d2f9375ffc Swapped a map for a list in writeBroadcaster.
Upstream-commit: 75ba07cb3a7fcf5d6cc9f1120fd3468a9658be67
Component: engine
2013-03-30 16:04:19 +01:00
248356b56f Make writeBroadcaster safe for concurrent use.
Upstream-commit: 0bdfcfaa33b4945fdfd6ff9ea82bf3c5aa63848d
Component: engine
2013-03-30 16:02:22 +01: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
4e517cc302 Redundant message in basics.
Upstream-commit: e9d17b1f9155160d5601b756b6c9df3f60d02b00
Component: engine
2013-03-29 17:38:31 -07:00
996e1c5e82 Added a lot of basic instructions on various topics
Upstream-commit: 64376481767a6a4a1d2b90b225a6ac5bf6bc16f9
Component: engine
2013-03-29 17:30:10 -07:00
716ff00c8b packaging; issue #30: Original files to make the Ubuntu PPA on launch date
Upstream-commit: e99541e63729343e908b7c2ab6c901504f1311a3
Component: engine
2013-03-29 14:57:31 -07:00