Commit Graph

21804 Commits

Author SHA1 Message Date
e37ef931cd Change the behaviour of CmdRun in tty mode: dont kill the process uppon detach
Upstream-commit: 64c1b6d9cd16b7d4cc8ebda2de82bc76e0c99f43
Component: engine
2013-04-09 08:18:16 -07:00
5cd0f30a95 add documentation for running a redis process with docker
Upstream-commit: 8f15c423e6049507908ec6e7b139f8bccbd6d3ba
Component: engine
2013-04-09 11:04:14 -04:00
b8a98bd6d9 Remove the mutexes and use chan instead in order to handle the wait lock
Upstream-commit: 329f4449dc0f5722150a8160262b817e12be20fc
Component: engine
2013-04-09 07:57:59 -07:00
7c684984e1 Merge pull request #346 from srid/patch-2
make the service example work
Upstream-commit: 0767916adedb01d61b01b91e7a0591ac7cb0f872
Component: engine
2013-04-08 22:12:34 -07:00
f699045f76 Merge remote-tracking branch 'origin/pty_fix-1'
Upstream-commit: 10923c7890871ac4e83a73f4dbf6e3981a106759
Component: engine
2013-04-08 21:12:22 -07:00
318f58e654 Added code and color for 'note' and updated the hello world note.
Upstream-commit: 2832ea0cfeb8eb69cf42db5ec0a115300e1383b9
Component: engine
2013-04-08 20:10:47 -07:00
ef277ddef4 Merge remote-tracking branch 'origin/unit_test_improvment-2'
Upstream-commit: a7299a3f2617a797af0df3082590ca361b687bf4
Component: engine
2013-04-08 18:29:12 -07:00
03ac5529c3 Make it more clear when Docker fails to allocate a free IP range for its bridge
Upstream-commit: 1601366cb6bfb9671ec28ced0bf88d11049264d3
Component: engine
2013-04-08 18:16:58 -07:00
6fa32df65e Update the tests according to the "optional raw mode" changes
Upstream-commit: e9a68801ba4c47581d7741989700a35521c389c4
Component: engine
2013-04-08 16:07:12 -07:00
5d32e30fa3 Add missing file
Upstream-commit: f73401fb9a0993d12da9ef60f265cd0502bb3808
Component: engine
2013-04-08 16:07:12 -07:00
8c4cdab2b2 Set the raw mode only for tty enabled containers
Upstream-commit: dcf4572a6914e50ce8797503ff0c180027d28301
Component: engine
2013-04-08 16:07:12 -07:00
b7ec43b00f Make commands.go more idiomatic. Use DockerConn only when needed, keep io.Writer when not
Upstream-commit: d530d581f7362aab16e9dfeee1143dd5c824e6c7
Component: engine
2013-04-08 15:58:09 -07:00
ab2b1cf277 Reenable CmdRunAttachStdin and CmdRunHostname now using the DockConn interface
Upstream-commit: bdf05d8368f2d158ba051dbefeb07bc717a93774
Component: engine
2013-04-08 15:58:09 -07:00
46d56b94a2 Improve error management (avoid unwanted output in tests)
Upstream-commit: b71b226cc1a69be5ce640f07b8de9c129e478360
Component: engine
2013-04-08 15:58:09 -07:00
7e2a370b5c Edit the tests for them to use the new command API. Disable TestRunHostname and TestAttachStdin.
Upstream-commit: 80f6b4587b6ebaed30747d17b69af4d11d6389ab
Component: engine
2013-04-08 15:58:09 -07:00
a479f5cbd8 Use io.WriteCloser instead of *os.File in DockerLocalConn so we can use it with standard writers and pipes
Upstream-commit: e6e9c1cd62bf78e66623950a9f76ef76c6f0f792
Component: engine
2013-04-08 15:58:09 -07:00
2c9d6a2303 Move DockerLocalConn and terminal functions form package "main" to "rcli" in order to be able to use DockerLocalConn in commands_test.go
Upstream-commit: 246eed52de1038ccec462e500b942711735a7c24
Component: engine
2013-04-08 15:58:09 -07:00
e262b369bb Simplification in the goroutine that restore the terminal state on SIGINT
Upstream-commit: b306a6073882e7995d74801d77d7baca4b12ec86
Component: engine
2013-04-08 15:58:09 -07:00
7815b9b259 Only set the terminal in raw mode for commands which need it
The raw mode is actually only needed when you attach to a container.
Having it enabled all the time can be a pain, e.g: if docker crashes
your terminal will end up in a broken state.

Since we are currently missing a real API for the docker daemon to
negotiate this kind of options, this changeset actually enable the raw
mode on the login (because it outputs a password), run and attach
commands.

This "optional raw mode" is implemented by passing a more complicated
interface than io.Writer as the stdout argument of each command. This
interface (DockerConn) exposes a method which allows the command to set
the terminal in raw mode or not.

Finally, the code added by this changeset will be deprecated by a real
API for the docker daemon.
Upstream-commit: 7d0ab3858e51a2cea244da72bb842fe15a5a9ded
Component: engine
2013-04-08 15:58:09 -07:00
6d5af0ec53 Remove the unused http transport from rcli
Upstream-commit: 4e5001b46a3281809db0c6402a3e077fd1bef9cd
Component: engine
2013-04-08 15:58:09 -07:00
0231b887bd Merge pull request #347 from kencochrane/303_docs_fix
improved the example docs to help #303 
Upstream-commit: b8f9803459bdc151593720cb6148d6eb14972bb4
Component: engine
2013-04-08 11:50:07 -07:00
a8b5919caf Merge pull request #356 from flavio/improve_python_web_app_example
Extend the documentation covering the web app example
Upstream-commit: 0c018d369799cbc9e3eb3648e7c3eb90f4575f40
Component: engine
2013-04-08 11:49:17 -07:00
4e538f07a8 Extend the documentation covering the web app example
Make it clear how to access the web app running inside of the container
from the host.
Upstream-commit: 72fdb4106997799df49faffb96de1d076e8ad755
Component: engine
2013-04-08 17:39:30 +02:00
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