Commit Graph
5570 Commits
Author SHA1 Message Date
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
Marek Goldmann 890b7668d4 Make sure the firewall rules are created even if the bridge interface is already created
Upstream-commit: 0ff9bc1be3ae044107732c605986a0af20220134
Component: engine
2013-11-27 12:14:18 +01:00
dkumor 940806c07b Arch docs: Updated dependencies to match AUR
The AUR packages lxc-docker and lxc-docker-git have changed their dependencies.
Upstream-commit: b3e8ba19085732d9f633e4cbddb660f5f8dc5462
Component: engine
2013-11-26 22:07:56 -06: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
dkumor 8009f3eca3 Deleted references to AUFS
AUFS is no longer a dependency (both lxc-docker and lxc-docker-git are >=0.7), and the Arch kernel doesn't need to be replaced with AUFS_friendly.
Upstream-commit: d370a889c37b762a8ddf7e29a8e666fd7cedec3d
Component: engine
2013-11-26 20:00:13 -06:00
Michael Crosby aaebc7758b Increase max image depth to 127
Upstream-commit: 6d34c50e898507e461300ecf91ed661011bc15ab
Component: engine
2013-11-26 17:04:55 -08: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
Guillaume J. Charmes 9ed97e9dc0 Change the default Host affectation to not rely on slice
Upstream-commit: 5e3f6e7023fbd0cfd1233a99c332801755340cfb
Component: engine
2013-11-26 18:31:59 +00:00
Guillaume J. Charmes 8567f00b02 Format main()
Upstream-commit: 1beb5005d11b8fadd04e51c4a1341779d26a475d
Component: engine
2013-11-26 17:47:58 +00:00
Guillaume J. Charmes f211a9a21d Refactor Opts
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
2013-11-26 17:46:06 +00:00
Tianon Gravi 7a9a45e0c5 Fix CHANGELOG: we ended up not merging the btrfs driver for last night's release
Upstream-commit: 8398abf0dcda8fa7818b69355af9b99ab4e8bdfc
Component: engine
2013-11-26 09:36:46 -07: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
Guillaume J. Charmes 4c67203399 Merge pull request #2872 from goldmann/runtime_typo
Fix the 'but is not' typo
Upstream-commit: 17efa9dc2ddd50f686dc3092b6d2ae45aa39b303
Component: engine
2013-11-26 07:40:25 -08:00
Nicolas Kaiser 7dd10871ef fix typo in CONTRIBUTING.md
Upstream-commit: 76c71260f13af3005c2407e2a19a422741b97117
Component: engine
2013-11-26 16:13:39 +01:00
Yurii Rashkovskii c7a4b3b1ae Fix command line help for docker save
`docker save IMAGE DESTINATION` is not what `docker save` expects
Upstream-commit: 82674372946b431f93add255e137f82822eecfc1
Component: engine
2013-11-26 06:54:46 -08: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 ee2ccd6f5f fix -link parsing
Upstream-commit: 0d078b65817fc91eba916652b3f087a6c2eef851
Component: engine
2013-11-26 00:09:45 -08:00
Victor Vieux 64a1f0700d Merge pull request #2870 from dotcloud/fix-links-parsing
fix -link parsing
Upstream-commit: 06d5e25224f8e24cbf8fd367437789ec32f592ca
Component: engine
2013-11-26 00:09:09 -08:00
Victor Vieux 3a30422210 fix -link parsing
Upstream-commit: 009024ad6439fad28ab3a9d8db6b6844bfbba8c9
Component: engine
2013-11-26 00:05:46 -08:00
Victor Vieux 62865d0bfd fix docker run on an unknown image
Upstream-commit: 14d9f04e8971effcab45e76c5a69f6d997fb83dd
Component: engine
2013-11-25 23:28:48 -08:00
Victor Vieux 69e3f71f64 Merge pull request #2869 from dotcloud/fix-docker-pull-run
fix docker run on an unknown image
Upstream-commit: 18d08d0d427f6350b5742264f200475792f40c9f
Component: engine
2013-11-25 23:28:15 -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
Tianon Gravi 5f353e35e7 Add explicit test strings for new escapeFstabSpaces function
Upstream-commit: 1af6ffb9bb5a1dec665a56b1bdf621fd2e2b7377
Component: engine
2013-11-26 00:11:42 -07:00
Michael Crosby 2f99c2efdc Merge branch 'release'
Upstream-commit: 233ad38802174cc5a3458a34bebaf78472a348d1
Component: engine
2013-11-25 22:25:47 -08:00
Solomon Hykes 278ec44cf0 Merge pull request #2857 from shykes/0.7-release
0.7 release
Upstream-commit: db28e839e0292a9d4c9c24b33c4267703baa6e5b
Component: engine
2013-11-25 22:14:33 -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
Michael Crosby 174bb35f3e Merge pull request #2865 from tianon/arch-docs
A couple tiny docs consistency fixes
Upstream-commit: 06cf8fee1b9b588e0096349e94a0cb95948c014e
Component: engine
2013-11-25 21:53:16 -08: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
Solomon Hykes 8a3d9c6cf3 Fix a race condition in the integration tests
Upstream-commit: 23022932440006aca0a954763bf8e3a5882f94d3
Component: engine
2013-11-26 05:28:00 +00:00
Tianon Gravi 24154237f8 Merge pull request #2863 from jamtur01/instsort
Installation docs update
Upstream-commit: fd7ff6411dcf792222b8d5a87333df1e42d22a2c
Component: engine
2013-11-25 21:19:30 -08:00
James Turnbull d367eeb253 Installation docs update
* Updated TOC sort order
* Fixed some grammar in Rackspace doc
* Updated titles to remove Linux where not needed
Upstream-commit: 59f76bf1c707c01ea548c4f3f2fdfba74c764e63
Component: engine
2013-11-26 00:16:30 -05:00