Guillaume J. Charmes
caf6f256a4
Fix term.RestoreTerminal behavior
...
Upstream-commit: aa68656cd3aefe2a64dc259e8d19c72010e4f85b
Component: engine
2013-11-29 09:52:44 -08:00
Guillaume J. Charmes
4a151bb6e6
Actually test the detach (was not the case before)
...
Upstream-commit: 63d6cbe3e4d6f29c2491b0f1f505ef79b7191d8e
Component: engine
2013-11-29 09:11:20 -08:00
Guillaume J. Charmes
eab6c90e20
Make the PTY in raw mode before assert test (TestAttachDetach)
...
Upstream-commit: 67e9e0e11bb932ef9113ac91b2c1b0af6ee4db6d
Component: engine
2013-11-29 08:29:56 -08:00
Guillaume J. Charmes
fb39460944
Add a GetPtyMaster() method to container to retrieve the pty from an other package.
...
We could also have put ptyMaster public, but then we need to ignore it in json
otherwise the Marshalling fails. I think it is cleaner that way.
Upstream-commit: fbebe20bc69648c046e3818ca744ae246092a782
Component: engine
2013-11-29 07:40:44 -08:00
Guillaume J. Charmes
9f9072c9ad
Make sure the container is running before testing against it (TestAttachDetach)
...
Upstream-commit: e535f544c7bc9c32b23e5505110a5513ff36be5a
Component: engine
2013-11-29 07:39:51 -08:00
cressie176
08c53cdcf1
Closing connection after ping
...
Upstream-commit: fe727e2a87fa086d728664c396fd44f4be6d6afd
Component: engine
2013-11-29 12:07:20 +00:00
Guillaume J. Charmes
6bd279c623
Merge branch 'master' into docker-osx
...
Upstream-commit: f72e6048722baf8476dbadc3a10830bb55d6ef1b
Component: engine
2013-11-28 21:16:32 -08:00
Victor Vieux
34e8bb0db2
Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
...
Add specific feedback for ADD outside context
Upstream-commit: 926f7b579e48dcd5bda26bcd7a0ef0e25aed94da
Component: engine
2013-11-28 17:55:11 -08:00
Victor Vieux
43b168be86
Merge pull request #2357 from ulyssecarion/master
...
Document setting up Vagrant-docker with the remote API
Upstream-commit: ff5747728c6a0bde71108c86b20b0880c2d3d6e4
Component: engine
2013-11-28 17:54:05 -08:00
Thatcher
4a247aee4e
Merge pull request #2901 from dkumor/patch-1
...
Deleted references to AUFS in Arch docs
Upstream-commit: 6c5699363954d145bd51c6069db587b1aceece8a
Component: engine
2013-11-28 17:39:26 -08:00
Sven Dowideit
98a6754c91
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
...
Upstream-commit: ba5268d382dec7b731717feec77b6e7d2e6cfdaf
Component: engine
2013-11-29 11:22:17 +10:00
Thatcher Peskens
be864815d2
Fixed some grammar and one other line about needing the postgresql-client for connecting to the service.
...
Upstream-commit: 8291d509c234779dff081ab579b6ff30358e7501
Component: engine
2013-11-28 17:19:26 -08:00
Thatcher
b5bdf9e788
Merge pull request #2894 from brunoqc/patch-1
...
Update postgresql's version in example
Upstream-commit: 139644895e39fd452d0aa7b2835f4bdd0f2ec461
Component: engine
2013-11-28 17:16:25 -08:00
Victor Vieux
bc039de754
Merge pull request #2941 from codeaholics/2940-invalid-registry-calls
...
Stop invalid calls to Registry
Upstream-commit: cca9e51f5d9747dc03830f0c255543a0c9137cc3
Component: engine
2013-11-28 17:00:22 -08:00
Victor Vieux
1c0208b60e
Merge pull request #2808 from tianon/run-all-tests
...
Update test scripts to always run ALL tests, even when some fail
Upstream-commit: 668d22be5485e3f25f836788d62683828cd621fe
Component: engine
2013-11-28 16:58:31 -08:00
Guillaume J. Charmes
04d46060bc
Make CopyEscapable consistent with Copy and return nil in case of success instead of io.EOF
...
Upstream-commit: 77c94175bdc387e7f43876f7097b970f67116054
Component: engine
2013-11-28 16:57:51 -08:00
Victor Vieux
3fa08922b3
Merge pull request #2923 from creack/refactor_cgo_in_go
...
Refactor attach loop device in pure Go
Upstream-commit: f94ea7769fd3e47c5914eb2fdad62c9d2162c339
Component: engine
2013-11-28 16:52:38 -08:00
Victor Vieux
49a166224c
Merge pull request #2844 from tianon/fix-mount-spaces
...
Add space-escaping to path parts of lxc.mount.entry lines in generated lxc.conf, allowing for spaces in mount point names
Upstream-commit: 39bec226c0cfb76ab3486129a6e02b1572653051
Component: engine
2013-11-28 16:48:36 -08:00
Victor Vieux
a63f83c19a
Merge pull request #2881 from yrashk/patch-1
...
Fix command line help for docker save
Upstream-commit: 677e2ad92ef526918e5054b5afe1fbd858219fa3
Component: engine
2013-11-28 16:42:40 -08:00
Victor Vieux
ca4170e277
add test
...
Upstream-commit: d3cc558d140283a4ce051827705814cf4ca96f7a
Component: engine
2013-11-28 16:28:31 -08:00
Guillaume J. Charmes
014494a3f4
Make race condition more obvious by performing more asserts
...
Upstream-commit: ad43d88af5bda8dc5b3d06f64de380bb985191ba
Component: engine
2013-11-28 16:12:45 -08:00
Michael Crosby
36cc89d71d
Return process exit code for attach
...
Fixes #2240
Upstream-commit: 1fe1b216ad9b60f6b25a5dadda5fe26c3602b054
Component: engine
2013-11-28 15:25:50 -08:00
Solomon Hykes
108a9c911c
Merge pull request #2818 from pnasrat/docker-pprof
...
Wire in pprof handlers.
Upstream-commit: 3faf450f11d92a6cbcf498ee85b57f4743612aac
Component: engine
2013-11-28 14:43:13 -08:00
Victor Vieux
e7389b7de1
fix display on test
...
Upstream-commit: b36dd3f9ccc61e42024cf1f2799c73f0efc77c75
Component: engine
2013-11-28 14:40:17 -08:00
Thatcher
7a655fcbd8
Merge pull request #2937 from jwarwick/hello_world_doc
...
Remove explanation of removed argument
Upstream-commit: a0525d90abd7ab3c95ae90302ffcc8c69fe6f429
Component: engine
2013-11-28 14:35:17 -08:00
Victor Vieux
53c5a8d270
add progressbar and time
...
Upstream-commit: ebc36b879d4197a9455b325b529da212539e180c
Component: engine
2013-11-28 14:33:18 -08:00
Thatcher
f98721fac4
Merge pull request #2922 from ath0mas/patch-1
...
Restore 'save' paragraph
Upstream-commit: 14425c1690d56f8c472f93a1d01bfd40cd3a4f78
Component: engine
2013-11-28 14:15:43 -08:00
Michael Crosby
6805e23c72
Merge pull request #2888 from tianon/changelog-fix
...
Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
Upstream-commit: aae23255a0ce02d96dd58267e3adf503aabeb458
Component: engine
2013-11-28 12:24:56 -08:00
Guillaume J. Charmes
d61719d4a1
Make volumes opts more strict
...
Upstream-commit: 2bbc90e92ff140c29891e92c9ce320ca7d19cd57
Component: engine
2013-11-28 12:24:04 -08:00
Guillaume J. Charmes
8406ad8872
Merge branch 'master' into refactor_opts
...
Conflicts:
commands.go
Upstream-commit: 0c758e93127d5575caa7042d01804f77b9f76b0c
Component: engine
2013-11-28 12:23:45 -08:00
Victor Vieux
ee50ddf929
split in 3 files
...
Upstream-commit: 597e0e69b4c8521f39691d0a07d1f31b7116a337
Component: engine
2013-11-28 12:16:57 -08:00
Guillaume J. Charmes
908bc35224
Improve devmapper unit tests with syscall/ioctl
...
Upstream-commit: 261bd0d187cbc8f650d77e5c93872332c290b164
Component: engine
2013-11-28 11:53:09 -08:00
Michael Crosby
391598f889
Merge pull request #2892 from creack/add_cli_test-1
...
Add ParseRun unit tests
Upstream-commit: 3d0486979e32c503625dbe96de625f7ebd29e2d6
Component: engine
2013-11-28 11:39:48 -08:00
Victor Vieux
9eafea47b6
Merge pull request #2913 from pnasrat/2852-deleteimage-performance
...
Performance of deleteImageAndChildren.
Upstream-commit: 377817db1b2fadf9c4294d8356aa7c75eb12e83a
Component: engine
2013-11-28 11:20:43 -08:00
Guillaume J. Charmes
a718116c6b
Correct comments
...
Upstream-commit: a990b3aeb9640d35e73f99030e03e58e71924ed5
Component: engine
2013-11-28 11:02:53 -08:00
Paul Nasrat
798ad27de8
Wire in pprof handlers.
...
Based on http://stackoverflow.com/questions/19591065/profiling-go-web-application-built-with-gorillas-mux-with-net-http-pprof
Upstream-commit: 9f46779d42c9b90a70c3c434d03a4502070e1b6d
Component: engine
2013-11-28 13:46:58 -05:00
Guillaume J. Charmes
799ccd9aee
Rename file for consistency
...
Upstream-commit: 533067bba47acec0f65dc7e499944b9402bafb04
Component: engine
2013-11-28 10:37:03 -08:00
Tianon Gravi
dc3ebf1a2f
Add proper dockerinit path support for distros that use FHS 2.3
...
Upstream-commit: 438607ecc321a0256b7597cf278d4356632aac2f
Component: engine
2013-11-28 11:11:30 -07:00
Danny Yates
752dcb1a87
Stop invalid calls to Registry
...
This code was resulting in a call for
/v1/images/<namespace>/<repository>/ancestry which the Registry
doesn't understand. Furthermore, it was masking the original
error.
Upstream-commit: d47507791e14908e78cf38d415a9863c9ef75c5e
Component: engine
2013-11-28 16:43:28 +00:00
Paul Nasrat
62f27e0053
Remove incorrect SIGKILL handler.
...
As per POSIX signal handling SIGKILL does not work.
Fixes #2928
Upstream-commit: bdfe8ed403591022ac46371798783c7bbe6134c9
Component: engine
2013-11-28 10:42:06 -05:00
John Warwick
4b1fc75599
Remove explanation of removed argument
...
Upstream-commit: f1e44e0b0c6eff011c596008c75f7fdff09dbf5e
Component: engine
2013-11-28 09:55:15 -05:00
Ulysse Carion
a109c2d18a
Document setting up Vagrant-docker with the remote API
...
Upstream-commit: c226ab6d9edb6b74547348c309c633f207bd4aa4
Component: engine
2013-11-27 20:05:54 -08:00
Guillaume J. Charmes
b58882f8a7
Move reflink to os dependent file. OSX docker client fully functionnal.
...
Upstream-commit: 74ea136a49e78442c8ec14307bac8e171f5dc224
Component: engine
2013-11-27 19:23:48 -08:00
Guillaume J. Charmes
5f4f9d994f
Make devicemapper linux-only
...
Upstream-commit: 24c03b2d938d383dd7669dc8faad7e2110a11173
Component: engine
2013-11-27 19:12:51 -08:00
Guillaume J. Charmes
dedf4cec9b
Merge branch 'master' into refactor_cgo_in_go
...
Upstream-commit: a58fef9f134d5be5f3093502c0acf42f98a7d932
Component: engine
2013-11-27 18:55:11 -08:00
Victor Vieux
28b7c6878a
Merge pull request #2927 from andrewsmedina/stat_macos
...
Move syscall.Stats logic to os specific file.
Upstream-commit: 597ca192e720821dfdf94b3b8d0bec74bee63ee7
Component: engine
2013-11-27 18:32:18 -08:00
Andrews Medina
3f2a763338
Move syscall.Stats logic to os specific file.
...
related to #2909 .
Upstream-commit: 8b2a7e35c35f894dca0795a4fde9ec0cfe04ce43
Component: engine
2013-11-28 00:22:47 -02:00
Guillaume J. Charmes
db6404f914
Check if the target loopback is a block device
...
Upstream-commit: 8a5d927a5337b1c9a0c8478c4e522ce0ded09b85
Component: engine
2013-11-27 18:21:17 -08:00
Guillaume J. Charmes
6eb8ce2948
Extract ioctl from wrapper
...
Upstream-commit: 1214b8897bba2a33a7ded8779bcdc966fe1cb176
Component: engine
2013-11-27 17:47:20 -08:00
Guillaume J. Charmes
3ddb3cbb0d
Move attach loop device to its own file
...
Upstream-commit: eb528b959efc0a3924939991be45704047fd5aea
Component: engine
2013-11-27 17:12:57 -08:00