Commit Graph

20395 Commits

Author SHA1 Message Date
bb5c0135f0 Check WaitTimeout return in test, replaced lock initialization in runtime.Register() with call to initLock()
Upstream-commit: ad0183e41978b3b156234f801750034912915223
Component: engine
2013-04-03 10:48:02 -07:00
da9369bbbf clean up AttachOpts type
Primarily, there is no reason to have a pointer to a map. Furthermore,
make() can be used on AttachOpts directly.
Upstream-commit: 4f36039e7b5c7054fdbf3eb328c242e7acb6d7f8
Component: engine
2013-04-03 16:06:35 +02:00
4e81438347 change option description to reflect the semantics
At least, for me, 'map' means that there are two values and one is "mapped" to
another.

In this case, just one value is provided (container's port), the other value is
automatically obtained (host's port) and the actual mapping can be seen using
``docker port`` command.
Upstream-commit: b74d1c92479bc6df61e7283f7639b02837bfb5f3
Component: engine
2013-04-03 16:37:56 +03:00
8ee2fa2877 move each command description into a separate document
Upstream-commit: cf8b8c1969daa423a1308561f3c1b2b863c64655
Component: engine
2013-04-03 15:55:18 +03:00
23a4c38130 Moved resetLock() to the Load() method ; changed resetLock() to initLock() and changed behavior to not modify the lock if it was already set (not nil)
Upstream-commit: d1767bbf672355b9063099d641106dd4ea5303b3
Component: engine
2013-04-03 05:39:39 -07:00
e0353cfeee Integrated @creack's feedback on TestRestore
Upstream-commit: 7b74b9cab50ecd12ca2af51116279fce97edadd8
Component: engine
2013-04-03 05:37:45 -07:00
3025ceb6c5 remove superfluous panic
Upstream-commit: 14d3880daf9bdfe52248b5b0548a5522161baf2c
Component: engine
2013-04-03 11:19:48 +02:00
d6aac87dba replace unreachable returns with panics
Not only is this a more common idiom, it'll make finding bugs easier,
and it'll make porting to Go 1.1 easier.

Go 1.1 will not require the final return or panic because it has a
notion of terminating statements.
Upstream-commit: 22f1cc955dbf25132e69d126f8db0e5498bffbd2
Component: engine
2013-04-03 11:18:23 +02:00
668c8b4472 use wg.Done() isntead of wg.Add(-1)
Upstream-commit: cab31fd5128fbfcc2f1b44d3d643fe96a28c88fc
Component: engine
2013-04-03 11:11:34 +02:00
f1a2914b2e kill the right containers in runtime_test
Upstream-commit: 1fc55c2bb9bce1451d6199e8aaa23ef8baa0e46c
Component: engine
2013-04-03 11:11:06 +02:00
2aa92512ac remove dead code in CmdPush
Upstream-commit: 5ecd940a594507075e6cee80aa70c258a9d850ca
Component: engine
2013-04-03 11:08:32 +02:00
ee5a6f13c1 use fmt.Fprintf instead of fmt.Fprint
fmt.Fprint does not allow format strings
Upstream-commit: 3b8c2417fbeaf84c4fb35e30f4c1a32ffcb51a59
Component: engine
2013-04-03 11:04:33 +02:00
36ddc7dcc6 Merged attachStdin
Upstream-commit: 15c3096e8942ac31eb5611b41d08fcc31061be65
Component: engine
2013-04-02 20:46:32 -07:00
23aad300e5 Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
Upstream-commit: 22d16229264aeb176acc40db2158d9b944cb3ef1
Component: engine
2013-04-02 20:35:13 -07:00
ca62613e60 Merged shawnsi/git-version
Upstream-commit: 35c68944c7a5c7b7778c6cdb54b149e22c4c0c64
Component: engine
2013-04-02 20:26:22 -07:00
57e119bf13 TestRunHostname checks that 'docker run -h' correctly sets a custom hostname
Upstream-commit: b1fa26bb76501c53f68de466538da1eece57d94d
Component: engine
2013-04-02 19:00:05 -07:00
b539ba53c2 Merge remote-tracking branch 'sa2ajj/hostname-parameter'
Upstream-commit: d6fb2a0836de056d79f4887eabfc2d79e8518988
Component: engine
2013-04-02 18:41:14 -07:00
927b0fdedf Merged dhrp/docs
Upstream-commit: 65aa3dda852115dae2501d65e2f4154c5a6ccf63
Component: engine
2013-04-02 18:39:39 -07:00
6806cbe306 Fix a bug which caused 'docker push' to fail with 411-lenght-required in Go 1.0
Upstream-commit: a05af3ebf32da594648352a30b9045c67ba9cbbb
Component: engine
2013-04-02 18:37:29 -07:00
b447b03d62 Merge remote-tracking branch 'unclejack/194-high-image-compression'
Upstream-commit: 0e1781af26c3d7770ee6b50955f9f947790baf6d
Component: engine
2013-04-02 18:10:07 -07:00
032c20ebdf Merge branch 'master' into attach-stdin
Upstream-commit: 14d9f51bbec3d68522d48857e089e5c8179d805c
Component: engine
2013-04-02 18:07:45 -07:00
7777dd857e docker run [-a [stdin|stdout|stderr] [...]]: choose which streams to attach to when running a command. Fixes #234.
Upstream-commit: c04af2a330991fcd52bcce213bcb863cff95d378
Component: engine
2013-04-02 18:07:16 -07:00
506ecddd21 Add test for attaching only stdin at run with 'docker run -i -a=stdin'
Upstream-commit: c77063afcd00f97c6922c41e509090dd4f8c2b95
Component: engine
2013-04-02 18:05:19 -07:00
bfd11809a8 Discarding errors in CmdRun
Upstream-commit: a19a9e3ca81880f030a7621a9e03ffb63c95b1f1
Component: engine
2013-04-02 12:21:35 -07:00
9ff05ec38f Close the broadcaster once they are not needed anymore
Upstream-commit: ad2bbe23be869e3a3287cedbf0408115e97a4a49
Component: engine
2013-04-02 12:19:01 -07:00
20aa05fbaa Add a stdincloser to container.Attach in order to close the client connection when needed
Upstream-commit: 6882c78ce447b468262b53aef2ac0577151ea98c
Component: engine
2013-04-02 12:18:20 -07:00
5597e432af 'docker run' in attached mode no longer waits for the process to exit. Take this into account in the tests.
Upstream-commit: 2db358146f8bc0f63d840c8e0227bcbe7a8e3063
Component: engine
2013-04-02 11:07:49 -07:00
8a9e7f42f0 When simulating disconnects in the tests, make sure that the command returns - but don't check for a specific return value
Upstream-commit: 1cc1cb099ed8fb0e4fc47debe38a33d17e211a65
Component: engine
2013-04-02 11:06:42 -07:00
cd9062641b Activate Config.StdinOnce at argument parsing
Upstream-commit: aea2675f7b2e4aa8bf63c8472af40bc059bd5d14
Component: engine
2013-04-02 11:02:19 -07:00
138633b4ab [unit tests] Cleanly kill all containers before nuking a temporary runtime
Upstream-commit: 8f9e4542417421ee62ac952d1e04268520a75d8f
Component: engine
2013-04-02 11:00:14 -07:00
96ec0e911c Use an environment variable to activate debug mode, instead of a package-specific flag
Upstream-commit: 76663079312bb501f545823d9650df9eeda2c882
Component: engine
2013-04-02 10:58:16 -07:00
2dc1c74a96 Better crash simulation in TestRestore ; force state lock creation when loading a container from disk
Upstream-commit: 791ca6fde47d26a96134b1715580303ea6cd17ed
Component: engine
2013-04-02 10:06:49 -07:00
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
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