36efc4e5a2
added headers to examples linking back to running the examples page
...
Upstream-commit: 6eb8a74ff9aee90fe488de151fab6ec234b61d2a
Component: engine
2013-04-07 10:23:00 -04:00
05821916a6
made a new running the examples page, and added a link to the top of each example to the page to show people how to run them.
...
Upstream-commit: 81ebf4fcf6fe3521c606b5abcbe151176c51aca9
Component: engine
2013-04-07 10:21:08 -04:00
44ca22c601
sync with README
...
Upstream-commit: 9875a9b1f1b59114356c129f42449e2d62427f65
Component: engine
2013-04-07 00:43:57 -07:00
13705974c6
make the service example work
...
issue #98 requires connecting to localhost (which `hostname` may resolve to) will not work.
Upstream-commit: 27feba459492bb381a037bf2f4766d51fdf53812
Component: engine
2013-04-07 00:41:24 -07:00
c8a8294b68
Move the DockerConn flush to its own function
...
Upstream-commit: c83393a541353ab34612d80cc6b9bb4e92c59597
Component: engine
2013-04-05 20:08:31 -07:00
b2cdbb0f98
Make sure to flush buffer when setting raw mode
...
Upstream-commit: 7e1e7d14fa257692231bc7e13e796e07607879c2
Component: engine
2013-04-05 19:48:49 -07:00
91c3817cdd
Fix run disconnect behavious in tty mode + add unit test to enforce it
...
Upstream-commit: 99b5bec0692ea9ec8a397926df9dd545fb264ac9
Component: engine
2013-04-05 19:02:35 -07:00
561e5a7afb
Cleanup pty variable names
...
Upstream-commit: 7d8895545e2442ea095f83c90edff64835a0d0b5
Component: engine
2013-04-05 17:40:55 -07:00
8f7ae9e955
Make sure the process start in his own session and grabs the terminal
...
Upstream-commit: 33a5fe3bd4cb0bd31b01da89c8c4c3321701e7a1
Component: engine
2013-04-05 17:40:55 -07:00
0d916a930b
Merge the 3 ptys in 1
...
Upstream-commit: 847a8f45a45dccd0574396b888670004e32762e6
Component: engine
2013-04-05 17:40:55 -07:00
329e4c0143
Changed default bridge interface do 'docker0'
...
Upstream-commit: 8cf30395a1a338c7c34adda0ae59ba8b2f9370cd
Component: engine
2013-04-05 14:16:19 -07:00
a5a58e7b30
The flag to use a pre-existing bridge interface is '-b'. Added explanation
...
Upstream-commit: 22adb52c0aaf4ff53d37eb45566d6aeeb907ed09
Component: engine
2013-04-05 14:16:04 -07:00
3bb1012d01
Merge remote-tracking branch 'origin/219-default-bridge-2'
...
Upstream-commit: 793c1ad9909701a8b89ac6731ac266048e48ec46
Component: engine
2013-04-05 14:02:16 -07:00
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
cba4b1444c
Increase the timeout in TestStart() to make sure the container has the time to die within the function
...
Upstream-commit: 20085794f023e2e5cf7d772a67f9c3b2e3afc93f
Component: engine
2013-04-05 02:01:38 -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
51b0dca52e
Prevent destroy() to stop twice container in TestRestore()
...
Upstream-commit: b76b329ef05748e75224e8fd09c1c697ddfd2a50
Component: engine
2013-04-04 20:40:42 -07:00
2bc3ef6328
Increase the timeout of TestRestore() to avoid unwanted timeout error
...
Upstream-commit: bae6f9583060187116aa8a069d0e63abfede5de0
Component: engine
2013-04-04 20:32:44 -07:00
d8fb828ed6
Avoid unwanted warnings from destroy() in TestStart()
...
Upstream-commit: cda9cf1539b4e3ce24ce77892b1e68ddb454f566
Component: engine
2013-04-04 20:30:24 -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
5140fcb35f
Move the default bridge name to a constant
...
Upstream-commit: 1b370f9d8dbd1c476db766e8587617e795570d97
Component: engine
2013-04-04 05:33:28 -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
ad744d80e7
If bridge does not exists, try to create it
...
Upstream-commit: aa4bf4284b4d18874544368349cb9575d8412de8
Component: engine
2013-04-03 16:17:03 -07:00
04e71efb01
Make LXC aware of custom bridge
...
Upstream-commit: d9a9bfc9c7bee2e4316debcd9f393b8f2fb1e45a
Component: engine
2013-04-03 16:15:44 -07:00
d25d9d9cff
Add an helper function to check if two network overlaps. Also add unit tests for this function
...
Upstream-commit: 90a6e310fe4c70b99f9fa5c8d8615e2382edba0b
Component: engine
2013-04-03 16:15:43 -07:00
ae8058f403
Put the bridge interface name in the command line
...
Upstream-commit: f39af7e05da437d6ac95b19ccfa401598d1fb5d9
Component: engine
2013-04-03 16:15:43 -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
