5e92f87f4e
Merged changes
...
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
2013-04-22 18:38:42 -07:00
80a0321a4f
Updated gettingstarted with quicker install.
...
Upstream-commit: 690e1186704eff65ff72404eb2a686b2b205ee7c
Component: engine
2013-04-22 13:36:00 -07:00
469031c87e
Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.
...
Upstream-commit: 6c8dcd5cbbff2b33f878a32ae3b93abc0d7b9dae
Component: engine
2013-04-22 13:10:32 -07:00
a6f4f1acf8
Updated ubuntu install
...
Upstream-commit: 0731d1a582b44a18e9bfdf0764d232b46218346b
Component: engine
2013-04-19 20:59:43 -07:00
69774ce2e6
Updated documentation and fixed Vagrantfile
...
Upstream-commit: 8ecde8f9a5dcad23afea013a62d373cef303fa84
Component: engine
2013-04-19 20:57:50 -07:00
73ddc6a114
Added redirect from old location of documentation (/documentation), these was the location when we were on github.
...
Upstream-commit: 6de5ca1e64407582debe01f17377cdb7bb8d70c5
Component: engine
2013-04-18 16:00:18 -07:00
3e6a546aa8
Merge pull request #367 from johncosta/333-redis-documentation
...
Add documentation for running a redis process with docker
Upstream-commit: a1f54cad6cc66d0a84b0bf0cc427fe40ba6448d3
Component: engine
2013-04-09 18:16:39 -07:00
aa4c6e3497
incorporate feedback for improving the PR
...
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
bdbf282ee6
Merge github.com:dotcloud/docker into 333-redis-documentation
...
Upstream-commit: 418ef43fbb59d62dca20905bbc0753892ecb6c27
Component: engine
2013-04-09 16:07:40 -04:00
58a81e417b
Bumped version to 0.1.4
...
Upstream-commit: 40ebe78bb1d9750505d594d10bc9eb6979ef63ea
Component: engine
2013-04-09 13:00:50 -07:00
5936316577
Merge remote-tracking branch 'origin/disable_signals-create_escape_sequence'
...
Upstream-commit: 1b7115a33772806b36006f66b4425149f2fb3123
Component: engine
2013-04-09 12:56:32 -07:00
e3aae801dc
Update README with escape sequence
...
Upstream-commit: 2e6a5bc7ee932b3d723ca4b0a319477310b12c34
Component: engine
2013-04-09 12:55:26 -07:00
d00cf2eba1
Fix merge issue
...
Upstream-commit: 72cef46e5e504355266b9c83bd3693d07a35d0ee
Component: engine
2013-04-09 12:55:26 -07:00
4a464fa427
Use integers instead of non-printable chars in the escape sequence detection
...
Upstream-commit: 626bfd87a7eadd64b16fb02d547f75d1a8f94aa7
Component: engine
2013-04-09 12:55:26 -07:00
086efb3f6d
Remove unused optimization that could lead in loosing the escape sequence
...
Upstream-commit: 8f41f1fa60587d77ad3ce2109fc03180488f49cc
Component: engine
2013-04-09 12:55:26 -07:00
6c8223ce20
Look for the escape sequence only in tty mode
...
Upstream-commit: faa88436504e4a4a63ddb4f3736b11e721b760cd
Component: engine
2013-04-09 12:55:17 -07:00
a19d2a32c2
Fix deadlock on stop failure
...
Upstream-commit: 0d9e54367f7bf7da9670de723d533eaa920868c8
Component: engine
2013-04-09 12:06:01 -07:00
9ea0876e63
Implement an escape sequence in order to be able to detach from a container
...
Upstream-commit: 1f70b1e15d0dea5f36395d325cbac2892e4f2e8a
Component: engine
2013-04-09 11:06:17 -07:00
9b1bdc42ec
Disable signal catching and enable real posix raw mode
...
Upstream-commit: 3f63b8780765df735192ea0299e86e8cb7dbcb88
Component: engine
2013-04-09 11:06:17 -07:00
d3c4d21c19
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 9c3d2b6a4ed46eb3549416ceffd61683ad0a8efe
Component: engine
2013-04-09 11:02:43 -07:00
d7b36b0c91
Merge remote-tracking branch 'origin/change_run_detach_behavious_tty_mode'
...
Upstream-commit: 1716fccbccb108383345b352ab8d3c66423319aa
Component: engine
2013-04-09 10:39:13 -07:00
c0f86c8179
Merge pull request #363 from dhrp/docs
...
Added code and color for 'note' and updated the examples note.
Upstream-commit: 9043e4c75728059e63b7ab76701a838d6da06494
Component: engine
2013-04-09 10:36:44 -07:00
0327a0e1c1
Merge remote-tracking branch 'origin/fix_flush_behaviour'
...
Upstream-commit: 2e9a73c5d851ec3893c1013721bdaf3362c92dfc
Component: engine
2013-04-09 10:31:56 -07:00
34cecb4070
Flush stdout on import to avoid deadklock when waiting for stdin (import -). Fixed #365
...
Upstream-commit: 1eaaa6b744b8017e7d31bdf9dc7095663b4c930c
Component: engine
2013-04-09 10:02:57 -07:00
00965e0e9e
Flush whether or not there we set the rawmode to avoid the client to lock
...
Upstream-commit: cb54e9c659c681fde5311aacefe0e5ea8c564e17
Component: engine
2013-04-09 09:59:30 -07:00
fb9222b734
Add inconditionnal lock in Start/Stop/Kill to avoid races
...
Upstream-commit: 7c2b085d1a1394dc88b0cdf5c9df02ee1c1b2229
Component: engine
2013-04-09 09:09:54 -07:00
555829afe7
Update the unit test to reflect the new CmdRun behaviour in tty mode
...
Upstream-commit: d063d52cce9892c777722b30923d9fb1f1385fe8
Component: engine
2013-04-09 08:18:36 -07:00
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
