4af9c309f0
Put the resolv.conf path in a variable instead of being hardcoded within lxc
...
Upstream-commit: 1f9f5eed5d004395886b8e93cec9389332d8fded
Component: engine
2013-04-10 18:23:34 -07:00
7d008a24f8
Use ip to setup the gateway in sysinit.go
...
ip from iproute2 replaces the legacy route tool which is often not
installed by default on recent Linux distributions.
The same patch has been done in network.go and is re-used here.
Upstream-commit: 5e1a975b48c1d4e6743f68ca770f8fe06fb32ce4
Component: engine
2013-04-10 17:40:28 -07:00
bcc22cca7d
Allow rmi to remove image from its name
...
Upstream-commit: 97f48e59fcfa8ca0f0a20ed80cab7330af93ae6d
Component: engine
2013-04-10 17:23:42 -07:00
4fbbe500d2
Added temporary spec for data volumes as requested on #111
...
Upstream-commit: e41fd24542d96c503cd923a403c43aceaf9af965
Component: engine
2013-04-10 13:57:26 -07:00
053e80b29d
changed last to n
...
Upstream-commit: 8bd192fb16a5ac9836d4b1d3df037af65b61ffce
Component: engine
2013-04-10 21:09:21 +02:00
226b7e3c89
testing: Make postcommit more generic
...
Upstream-commit: d2c1850fb5a210d59b87dcb8504c8c24b60cca3c
Component: engine
2013-04-10 11:32:48 -07:00
551b762e13
add -l to docker ps
...
Upstream-commit: 8c3331dc978e3cbbe3255a436c8f18f01158eb27
Component: engine
2013-04-10 19:30:57 +02:00
884a342273
Merge pull request #372 from srid/goroutine-scope
...
serve goroutine must refer to the local conn
Upstream-commit: f507188ddc907f7e7b628145a89e455a5eeacc28
Component: engine
2013-04-09 21:06:31 -07:00
63abdc99ee
Merge remote-tracking branch 'origin/wait_non_existing_container-fix'
...
Upstream-commit: 76b7b2adf765732f8a43d7536e9720d2b4f3f6bb
Component: engine
2013-04-09 21:05:15 -07:00
05a22d6527
Fix the Makefile, rule=hack to make it work on Windows
...
Upstream-commit: b7cda3288ed857e4e2155846090b17a2d8fccdbf
Component: engine
2013-04-09 19:07:50 -07:00
e53c739014
Make sure all containers (even previously stopped) get a correct wait lock
...
Upstream-commit: 9f83b9df2256c7b34453d5da85c17fae516ee3a4
Component: engine
2013-04-09 17:40:02 -07:00
aa4c6e3497
incorporate feedback for improving the PR
...
Upstream-commit: 4ab241c93080d8df6db4fd0c31b0c26008118422
Component: engine
2013-04-09 18:04:01 -04:00
2f21f794cf
serve goroutine must refer to the local conn
...
Upstream-commit: f731835e4577c414d37fa050aaec1f541511ff6b
Component: engine
2013-04-09 15:00:05 -07:00
263f9f8591
testing: Add buildbot VM
...
Upstream-commit: bbaa975ec8ea44f7df4f96a910360abc43b4d5f7
Component: engine
2013-04-09 14:37:37 -07: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