f49bdcbf33
Add tests of tcp port allocator
...
Upstream-commit: febaeebfb8848265267213b2f6a6fc3a40ad90f1
Component: engine
2013-04-05 13:03:24 -07:00
4e013b9e8e
Fix a race condition when running the port allocator
...
Upstream-commit: d32f184696519f909d1db56a060b39f0a08b41c5
Component: engine
2013-04-05 13:03:04 -07:00
8d9a54f5f7
Bumping version to 0.1.3
...
Upstream-commit: a4fc52305abfcbc3976fa203898a1c3c8409a292
Component: engine
2013-04-04 23:05:03 -07:00
e9f0c90d6d
Choose which TCP frontend port to allocate with '-p :PORT'
...
Upstream-commit: 2aad4a34785a1b0d02d910a14dbb9b0d6d3edc17
Component: engine
2013-04-04 22:58:01 -07:00
c15214a816
Refactored PortAllocator to allow for same-frontend constraint
...
Upstream-commit: a5fb1d6c0105bb6d93c6b6890aa33bd99115973a
Component: engine
2013-04-04 22:56:12 -07:00
cee3dd3980
Renamed PortAllocator.populate() to run()
...
Upstream-commit: f344212b93cc1de672a6a09906b719c2e287d558
Component: engine
2013-04-04 19:49:32 -07:00
6b2f94ee3c
Print a less confusing error message when lxcbr0 doesn't exist
...
Upstream-commit: 0424998f3885b715ad0fae074170a9be19c95680
Component: engine
2013-04-04 19:14:10 -07:00
4b2813872d
Add versioning to docker image format. IMPORTANT: the format versioning is pegged to docker's versioning, so changes to the format MUST trigger an increment in version number.
...
Upstream-commit: 8bfbdd7afa504a1ddb09d026feb4d20eac4b4dd5
Component: engine
2013-04-04 18:38:43 -07:00
8bbb6b65f9
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 3de51b7bfe27bd744470ee1e80dec8eb0c49f6de
Component: engine
2013-04-04 17:00:59 -07:00
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
b7d6bc48b8
Merge remote-tracking branch 'dominikh/minor-code-touchups'
...
Upstream-commit: 586a79cca0c0b7f432e31807e3b8ca79d565c27e
Component: engine
2013-04-04 16:20:37 -07:00
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
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
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
bbe5556b93
Merge remote-tracking branch 'dominikh/improve-attachopts'
...
Upstream-commit: 26088a72b34a0b2e17701f664e38a7d0a6ecd1b8
Component: engine
2013-04-04 15:18:41 -07:00
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
b59512a953
Merge remote-tracking branch 'unclejack/137-fix-nat'
...
Upstream-commit: c4d3da58710d0b84754ab9f9c27aee0771a45574
Component: engine
2013-04-04 15:06:20 -07:00
f74f70aea0
stop looping remote:port from host to containers
...
Upstream-commit: 32f58114766886fc38b66949bc3c0625dc225ade
Component: engine
2013-04-04 23:07:10 +03:00
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
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
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
a081015e8f
Bumped version to 0.1.2
...
Upstream-commit: dce5a06aba8e79e8e5fe5724676961319def6001
Component: engine
2013-04-03 15:35:32 -07:00
0e99b6b989
Fix NAT problem with ports looping back to containers
...
Upstream-commit: 3b65be9127865fd894edea4d0b7de0ab92421018
Component: engine
2013-04-04 01:32:46 +03:00
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
