Solomon Hykes
1b644b6e4b
Merge pull request #322 from sa2ajj/port-map-nitpick
...
change option description to reflect the semantics
Upstream-commit: a58cd8c616dc4e761a722246cf69a3feab428953
Component: engine
2013-04-04 16:39:54 -07:00
Solomon Hykes
33d69ebc2b
Merge pull request #331 from lynaghk/master
...
Fix broken link on documentation website between examples.
Upstream-commit: 349edf1beabb7d88254b3a7eafbb6528d2d954bf
Component: engine
2013-04-04 16:18:27 -07:00
Solomon Hykes
40e518a693
Merge pull request #320 from sa2ajj/cli-docs
...
move each command description into a separate document
Upstream-commit: 677908910c52bd85c84cf6747e78400e20830838
Component: engine
2013-04-04 16:17:53 -07:00
Solomon Hykes
862b5a4380
Merge remote-tracking branch 'origin/257-container_real_running_state-fix'
...
Upstream-commit: 6b5fe8c2ec9762617cf53ee241fcb284dfa77196
Component: engine
2013-04-04 15:34:18 -07:00
Solomon Hykes
bbe5556b93
Merge remote-tracking branch 'dominikh/improve-attachopts'
...
Upstream-commit: 26088a72b34a0b2e17701f664e38a7d0a6ecd1b8
Component: engine
2013-04-04 15:18:41 -07:00
Solomon Hykes
7286773837
Continue cleaning up iptables rules from previous version, to avoid crashing after an upgrade
...
Upstream-commit: ebc837957fb45c4ba4768a2344ea7b551bbb86e5
Component: engine
2013-04-04 15:16:42 -07:00
Solomon Hykes
b59512a953
Merge remote-tracking branch 'unclejack/137-fix-nat'
...
Upstream-commit: c4d3da58710d0b84754ab9f9c27aee0771a45574
Component: engine
2013-04-04 15:06:20 -07:00
unclejack
f74f70aea0
stop looping remote:port from host to containers
...
Upstream-commit: 32f58114766886fc38b66949bc3c0625dc225ade
Component: engine
2013-04-04 23:07:10 +03:00
Solomon Hykes
869e8630b3
Merge remote-tracking branch 'origin/328-i_o_error_uncloced_connection-fix'
...
Upstream-commit: a7f191d51db984cdcad568f213288efdc73fe103
Component: engine
2013-04-04 11:03:39 -07:00
Kevin J. Lynagh
908cac785f
Fix broken link in doc site.
...
Broken link was from python_web_app to nonexistent "base commands page"; updated to point to next item in examples menu, running_ssh_service screencast.
Upstream-commit: 92186d7cf71acbf4027e390b33590570cf4ff290
Component: engine
2013-04-03 22:23:17 -07:00
Solomon Hykes
d4dda83ea6
Simplified Graph.Delete() - no more garbage collecting, just atomic deregister then os.RemoveAll
...
Upstream-commit: 5d3c0767dab1679686933a9b4cf4ddde19bc0faf
Component: engine
2013-04-03 22:14:28 -07:00
Solomon Hykes
a081015e8f
Bumped version to 0.1.2
...
Upstream-commit: dce5a06aba8e79e8e5fe5724676961319def6001
Component: engine
2013-04-03 15:35:32 -07:00
unclejack
0e99b6b989
Fix NAT problem with ports looping back to containers
...
Upstream-commit: 3b65be9127865fd894edea4d0b7de0ab92421018
Component: engine
2013-04-04 01:32:46 +03:00
shin-
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
Dominik Honnef
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
Mikhail Sobolev
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
Mikhail Sobolev
8ee2fa2877
move each command description into a separate document
...
Upstream-commit: cf8b8c1969daa423a1308561f3c1b2b863c64655
Component: engine
2013-04-03 15:55:18 +03:00
shin-
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
shin-
e0353cfeee
Integrated @creack's feedback on TestRestore
...
Upstream-commit: 7b74b9cab50ecd12ca2af51116279fce97edadd8
Component: engine
2013-04-03 05:37:45 -07:00
Solomon Hykes
36ddc7dcc6
Merged attachStdin
...
Upstream-commit: 15c3096e8942ac31eb5611b41d08fcc31061be65
Component: engine
2013-04-02 20:46:32 -07:00
Solomon Hykes
23aad300e5
Merge remote-tracking branch 'robryk/writebroadcaster-stuff'
...
Upstream-commit: 22d16229264aeb176acc40db2158d9b944cb3ef1
Component: engine
2013-04-02 20:35:13 -07:00
Solomon Hykes
ca62613e60
Merged shawnsi/git-version
...
Upstream-commit: 35c68944c7a5c7b7778c6cdb54b149e22c4c0c64
Component: engine
2013-04-02 20:26:22 -07:00
Solomon Hykes
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
Solomon Hykes
b539ba53c2
Merge remote-tracking branch 'sa2ajj/hostname-parameter'
...
Upstream-commit: d6fb2a0836de056d79f4887eabfc2d79e8518988
Component: engine
2013-04-02 18:41:14 -07:00
Solomon Hykes
927b0fdedf
Merged dhrp/docs
...
Upstream-commit: 65aa3dda852115dae2501d65e2f4154c5a6ccf63
Component: engine
2013-04-02 18:39:39 -07:00
Solomon Hykes
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
Solomon Hykes
b447b03d62
Merge remote-tracking branch 'unclejack/194-high-image-compression'
...
Upstream-commit: 0e1781af26c3d7770ee6b50955f9f947790baf6d
Component: engine
2013-04-02 18:10:07 -07:00
Solomon Hykes
032c20ebdf
Merge branch 'master' into attach-stdin
...
Upstream-commit: 14d9f51bbec3d68522d48857e089e5c8179d805c
Component: engine
2013-04-02 18:07:45 -07:00
Solomon Hykes
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
Solomon Hykes
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
Guillaume J. Charmes
bfd11809a8
Discarding errors in CmdRun
...
Upstream-commit: a19a9e3ca81880f030a7621a9e03ffb63c95b1f1
Component: engine
2013-04-02 12:21:35 -07:00
Guillaume J. Charmes
9ff05ec38f
Close the broadcaster once they are not needed anymore
...
Upstream-commit: ad2bbe23be869e3a3287cedbf0408115e97a4a49
Component: engine
2013-04-02 12:19:01 -07:00
Guillaume J. Charmes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
cd9062641b
Activate Config.StdinOnce at argument parsing
...
Upstream-commit: aea2675f7b2e4aa8bf63c8472af40bc059bd5d14
Component: engine
2013-04-02 11:02:19 -07:00
Solomon Hykes
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
Solomon Hykes
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
shin-
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
Guillaume J. Charmes
44017879ad
Add a TestRunExit, make sure cmdRun returns after process dies
...
Upstream-commit: 43484e8b502be1dbf2e587524ae8ef036181b186
Component: engine
2013-04-02 09:22:30 -07:00
Shawn Siefkas
693692b24b
Implementing dirty git checkout indicator
...
Upstream-commit: 5471f5b2ee4bd637147a1ea1dce716670b50796d
Component: engine
2013-04-02 09:58:19 -05:00
shin-
7e0b5d8ac6
variable names
...
Upstream-commit: 02c211a0dca91bb3744b6c1301e372799189881f
Component: engine
2013-04-02 07:13:42 -07:00
shin-
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
shin-
058965deb1
Merge branch 'master' into 257-container_real_running_state-fix
...
Upstream-commit: 8edf0ca7f35c54ed0184ed0b7e086f1bd8ce5e63
Component: engine
2013-04-02 06:37:50 -07:00
shin-
3421949564
Fix for #307
...
Upstream-commit: 8fed600077d5b8d976adec27dfb822166ca7baa5
Component: engine
2013-04-02 03:00:21 -07:00
Robert Obryk
450827385c
Renamed writeBroadcaster.Close() to CloseWriters().
...
Upstream-commit: a83d87abd442dda5f2d67a2701aae9c7b891e68a
Component: engine
2013-04-02 10:45:17 +02:00
Solomon Hykes
f7fc21bc5d
Refactored CmdRun and CmdAttach to use Container.Attach
...
Upstream-commit: c808940c041ca8c7f9f9c5e0fa93e37ebfdd412a
Component: engine
2013-04-01 23:52:20 -07:00
Thatcher Peskens
38ad5f3006
Fixed a lot of language and small things.
...
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
2013-04-01 19:11:09 -07:00
Solomon Hykes
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
Solomon Hykes
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