Guillaume J. Charmes
30abdabd65
Fix TestAttachDetachTruncatedID (behavior + tty issue)
...
Upstream-commit: 2e6a958612d65a0665a9396372fe82706987d085
Component: engine
2013-11-29 10:03:36 -08:00
Guillaume J. Charmes
e107dad484
Create helper function for tests
...
Upstream-commit: 697be6aaa009cd2bea5f07ae0b0780703e6565e1
Component: engine
2013-11-29 10:02:22 -08:00
Guillaume J. Charmes
27de84e1e0
Make sure the termcaps are restored after hijack
...
Upstream-commit: c13821ad0bfa596a8bbc06a494500ee39a35e429
Component: engine
2013-11-29 09:55:15 -08:00
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
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
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
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
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
Solomon Hykes
804f3d1553
Merge pull request #2914 from crosbymichael/open-issues
...
Add instructions for opening issues on the repository
Upstream-commit: 39f21af6879bb69550084db4188985598beb3800
Component: engine
2013-11-27 15:25:12 -08:00
Michael Crosby
b9024bb8a7
Merge pull request #2831 from SvenDowideit/please-ignore-squiggle-backup-files
...
Please ignore squiggle backup files
Upstream-commit: 7f9cdaa342a724dca42d3882e07c294ea972361c
Component: engine
2013-11-27 11:04:21 -08:00
Michael Crosby
3abe5b8a85
Add instructions for opening issues on the repository
...
Upstream-commit: e4ae44b844a38327ee4288361376299595b1917e
Component: engine
2013-11-27 10:41:20 -08:00
Guillaume J. Charmes
3e874ec270
Merge pull request #2814 from dotcloud/release_checklist_update
...
update release checklist
Upstream-commit: 89454851d12c73c2865799c3d192eeaf55746b87
Component: engine
2013-11-27 10:04:55 -08:00
Guillaume J. Charmes
92016b6859
Merge pull request #2904 from SvenDowideit/dont-show-user-internal-slash-in-error-message
...
there appears to be a slash prepended to a container name internally
Upstream-commit: f75dc36204b37d9cb292fd3cf949e1cec1142c36
Component: engine
2013-11-27 09:58:24 -08:00
Paul Nasrat
d103214bb0
Performance of deleteImageAndChildren.
...
Don't walk the file system for parents each time we recurse.
Fixes #2852
Upstream-commit: 4e826e99b278ef3cc438553e958727397b4d9ee7
Component: engine
2013-11-27 12:55:15 -05:00
Danny Yates
a17dc473b7
Handle the case where poolAdd() gives an error for an unknown pool type
...
Upstream-commit: 788feab3a7de44a4749e5a861e3b6f778aa4088b
Component: engine
2013-11-27 16:53:36 +00:00
Danny Yates
55a368beae
Allow multiple clients to pull the same tag simultaneously
...
If two clients simultaneously try to pull the same tag, there was a race
whereby one would succeed and the second would generate an error. Now,
the second simply waits for the first to complete.
Upstream-commit: ae474e05f553c7abefc8674148e2a84a417bbf64
Component: engine
2013-11-27 12:18:01 +00:00
Sven Dowideit
121a1998cc
tell anyone that might want to ignore their editor choice's backup files that there is a better way - thanks @pnasrat
...
Upstream-commit: 7b95d410926bffa6d8f42095fa8b38e01a5ac67b
Component: engine
2013-11-27 13:19:06 +10:00
Sven Dowideit
f43b960fe1
there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it
...
Upstream-commit: 1cb7b9adc6b9a4e4c8f746c6886a7229b0efda91
Component: engine
2013-11-27 12:58:54 +10:00
Tianon Gravi
9d0c3761bc
Merge pull request #2887 from kleptog/master
...
Add mkseccomp.pl, helper script to make seccomp profiles.
Upstream-commit: 6344e6f258c7aef7d805b6ede8a94bde4372d7df
Component: engine
2013-11-26 15:24:35 -08:00
Guillaume J. Charmes
e74bd14f25
Add parseRun volume unit tests
...
Upstream-commit: 462e30dcbdc5010abe21b206bcd4be0c8bc71be6
Component: engine
2013-11-26 23:03:50 +00:00
Guillaume J. Charmes
f70d58d92d
Make volumes opts more strict
...
Upstream-commit: c7661f40b6c6a23e5fe2090a94bd9fa6521242d7
Component: engine
2013-11-26 23:00:44 +00:00
Guillaume J. Charmes
8e6cdb74dc
Add ParseRun unit tests
...
Upstream-commit: c707c587c1fbd8e68f1e9a3c64ee0aca764461eb
Component: engine
2013-11-26 20:16:16 +00:00
Martijn van Oosterhout
323783b03d
Add mkseccomp.pl, helper script to make seccomp profiles.
...
Upstream-commit: ab3a83c617ec5bfafee117ea0b6e92ce78bd46e5
Component: engine
2013-11-26 17:13:02 +01:00
Guillaume J. Charmes
c4d496c52c
Merge pull request #2884 from nikai3d/patch-1
...
fix typo in CONTRIBUTING.md
Upstream-commit: 8b99e4ed374b8048a548556a6ff97d2f2598a5f5
Component: engine
2013-11-26 07:40:49 -08:00
Nicolas Kaiser
7dd10871ef
fix typo in CONTRIBUTING.md
...
Upstream-commit: 76c71260f13af3005c2407e2a19a422741b97117
Component: engine
2013-11-26 16:13:39 +01:00
Marek Goldmann
f587c327f7
Fix the 'but is not' typo.
...
Upstream-commit: 9c15322894152095539e41623ef33ec0ebdc6c3f
Component: engine
2013-11-26 11:18:50 +01:00
Victor Vieux
3a30422210
fix -link parsing
...
Upstream-commit: 009024ad6439fad28ab3a9d8db6b6844bfbba8c9
Component: engine
2013-11-26 00:05:46 -08:00
Victor Vieux
8d3710fbe5
fix docker run on an unknown image
...
Upstream-commit: 0bb2c0b1d0f651e23c949381762fe79a45c58aeb
Component: engine
2013-11-25 23:20:36 -08:00
Michael Crosby
2f99c2efdc
Merge branch 'release'
...
Upstream-commit: 233ad38802174cc5a3458a34bebaf78472a348d1
Component: engine
2013-11-25 22:25:47 -08:00
Solomon Hykes
ae49d218bd
Add 0.7.0 Changelog entry, with notable high-level features since 0.6.0.
...
Upstream-commit: de30ffb2c3b9aa86a5abd6a40b661cec247c6dbd
Component: engine
2013-11-26 06:06:22 +00:00
Solomon Hykes
16e900a1c2
Bump version file to 0.7.0
...
Upstream-commit: 5c5ee194cb383be42c0d0b9fc53114fa991de564
Component: engine
2013-11-26 06:06:22 +00:00
Solomon Hykes
a9075c1b0d
Merge pull request #2868 from jamtur01/ubtfixes
...
Tidied up Ubuntu installation documentation
Upstream-commit: b6dd67c70779d42dc36dd662becb247b79a7c083
Component: engine
2013-11-25 22:05:36 -08:00
Michael Crosby
7d7d4a875e
Merge pull request #2867 from shykes/more-random-names
...
Add more moods and inventor names to random name generator
Upstream-commit: 740958dda7ec0efd6ba77a5dab892019d4755bd3
Component: engine
2013-11-25 22:04:29 -08:00
Solomon Hykes
cf209a1700
Remove non-ascii characters from name generator
...
Upstream-commit: c38386d876aab1c1e3391de2180cb03f083f8955
Component: engine
2013-11-26 06:02:37 +00:00
Victor Vieux
36c5097638
Merge pull request #2866 from tianon/binaries-docs
...
Update "Binaries" installation language to point to distro packages first
Upstream-commit: 4267fb66efd36e0c8cf564feb1e6d570902c45b1
Component: engine
2013-11-25 22:00:20 -08:00
James Turnbull
2136e5ee7f
Tidied up Ubuntu installation documentation
...
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
Solomon Hykes
be70b4650a
Add more moods to random name generator
...
Upstream-commit: 60809a4f72984881e8a8dc07bf585f07975baf7d
Component: engine
2013-11-26 05:55:48 +00:00
Tianon Gravi
ff01a9f153
Update "Binaries" installation language to point to distro packages first
...
Also, added a minor consistency update to our usage of "wget".
Upstream-commit: 65fcc81b426ced8f416da3260770705ac7c90580
Component: engine
2013-11-25 22:53:50 -07:00
Tianon Gravi
1113ee60b9
Update Fedora placeholder to include the same "community" and "pre-1.0" warnings so we don't forget them
...
Upstream-commit: c92dab0eb4db57fd880c7b0bbf84d7288d048fef
Component: engine
2013-11-25 22:48:51 -07:00
Tianon Gravi
c090d6cc77
Update Arch Linux instructions to include warnings at the top like other "community" platforms
...
Upstream-commit: 6ad5b2bcf4d04a0314583b29f9280d8000c1ee5a
Component: engine
2013-11-25 22:47:15 -07:00
Tianon Gravi
c26d8165d4
Merge pull request #2864 from tianon/gentoo-docs
...
Update the Gentoo installation docs for 0.7+
Upstream-commit: 77f1362c6471bf60447a28c1d3c4abb45e5123c0
Component: engine
2013-11-25 21:42:14 -08:00
Tianon Gravi
e6fb344369
Update the Gentoo installation docs for 0.7+
...
Upstream-commit: 4049359beeb8a253f07e6dbac213391a7b39f362
Component: engine
2013-11-25 22:40:24 -07:00
Michael Crosby
73eafb391f
Merge pull request #2862 from shykes/integration-tests-vfs
...
Improve integration tests with vfs driver
Upstream-commit: 7daefc9d3f32a0c154897528a468eea050510cde
Component: engine
2013-11-25 21:37:35 -08:00
Victor Vieux
7bbdc10a11
Merge pull request #2854 from dotcloud/copy_dockerinit
...
create a copy of dockerinit on new runtime to handle upgrades
Upstream-commit: d4c32b9015ab0e3dd61ace30ab7b9afd801a708a
Component: engine
2013-11-25 21:31:33 -08:00
Solomon Hykes
18e7ca81c6
Merge pull request #2815 from tianon/hack-make-tgz
...
Add tgz bundlescript
Upstream-commit: 8bd6127ab357a84bb95c8dc69373232549f2c96a
Component: engine
2013-11-25 21:29:14 -08:00
