Commit Graph

  • 4d3718f903 Merge pull request #1932 from jcassee/patch-1 Andy Rothfusz 2013-09-19 13:41:51 -07:00
  • e3a0cae46f Merge pull request #1901 from jalateras/update-contributring-docs Andy Rothfusz 2013-09-19 18:00:23 -07:00
  • 557d9cbc5e Merge pull request #1952 from metalivedev/1909-cherrypick Andy Rothfusz 2013-09-20 16:56:07 -07:00
  • d78346d443 Fix minor typo Nick Stinemates 2013-09-17 18:49:47 +00:00
  • 76b4037c8c Merge pull request #1949 from dotcloud/1895-registry-regex Michael Crosby 2013-09-20 14:03:50 -07:00
  • 94c2057eff Improve detach unit tests Upstream-commit: e97364ecd73fac7abfbd82cc7e3ebaa6cda3c935 Component: engine Guillaume J. Charmes 2013-09-20 13:36:19 -07:00
  • bcb4cc4982 Fix attach issue Upstream-commit: 2bd089dadb9a66829aa1835ad674d652244c5c97 Component: engine Guillaume J. Charmes 2013-09-20 11:31:00 -07:00
  • 721615e4c7 abord build if mergeConfig returns an error and fix duplicate error message Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d Component: engine Victor Vieux 2013-09-20 12:46:24 +00:00
  • 99d2e0befc Only copy files and change permissions with non bindmount Upstream-commit: b45e280ee8161b38127b90e718945130bc1e935a Component: engine Michael Crosby 2013-09-19 13:09:19 -07:00
  • b28da4e1a8 Modify repository name regex to match index Upstream-commit: 5867f9e7614e5761fdee1f5b6a607ef4f8311d7f Component: engine Michael Crosby 2013-09-19 20:25:00 -07:00
  • 590fe6f79d Merge pull request #1889 from dsissitka/fixhttpimport Victor Vieux 2013-09-20 03:06:04 -07:00
  • 7c4db68542 Merge pull request #1901 from jalateras/update-contributring-docs Andy Rothfusz 2013-09-19 18:00:23 -07:00
  • f1871e0df3 Updated the section about extracting the binary Upstream-commit: 3cf4b2c7c1729635170dd92f83461c9662d126e4 Component: engine Jim Alateras 2013-09-20 10:00:30 +10:00
  • eb6c475efd Updated the section about extracting the binary Upstream-commit: d70cbbf1fc33f2291a686537ba5b57913809e586 Component: engine Jim Alateras 2013-09-20 09:58:12 +10:00
  • 35bc3934c6 Updated the section about extracting the binary Upstream-commit: b7e7104e9293c0fd35bdb03d7f0cd00e7a90d615 Component: engine Jim Alateras 2013-09-20 09:49:20 +10:00
  • fa2129e045 Merge pull request #1932 from jcassee/patch-1 Andy Rothfusz 2013-09-19 13:41:51 -07:00
  • 787663083d Merge pull request #1929 from tianon/gentoo-docs Andy Rothfusz 2013-09-19 13:41:29 -07:00
  • e372fe8afc Download Ubuntu 13.04 repository key over HTTPS Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4 Component: engine Joost Cassee 2013-09-19 21:14:39 +02:00
  • 3eaff637a9 Merge pull request #1886 from dotcloud/multi-volumes-from Guillaume J. Charmes 2013-09-19 12:01:12 -07:00
  • 73fa9ee1c4 Merge pull request #1914 from tianon/base-repository-is-deprecated Andy Rothfusz 2013-09-19 11:04:11 -07:00
  • 66d947d16e Simplify install instructions now that our overlay is in the official repositories.xml list, and add note about hacky #1422 workaround Upstream-commit: 341addeccd2100611af27797b38421c5a0ab066f Component: engine Tianon Gravi 2013-09-19 11:49:43 -06:00
  • cdb2ec7f94 Remove many remaining docs references to the deprecated base repository and several other minor doc cleanups Upstream-commit: 47904290a563801b15eb204516f32c9517c11a47 Component: engine Tianon Gravi 2013-09-18 00:20:05 -06:00
  • 0118da35aa Docs: remove reference to deprecated 'base' image Upstream-commit: a18c26392ff7f4a756f499bd5c3032f2256cd04e Component: engine Solomon Hykes 2013-09-17 23:53:27 -05:00
  • 4165a8a92d Merge pull request #1913 from metalivedev/1654-registryexamples Andy Rothfusz 2013-09-18 17:53:13 -07:00
  • ed00bbf084 Update VERSION Upstream-commit: fee61895f2a2abc307839d7764d042604bd1e2d8 Component: engine Guillaume J. Charmes 2013-09-18 12:06:29 -07:00
  • 4def626e15 Merge remote-tracking branch 'origin/release' Upstream-commit: f6a78f89ba489f062ef9425cb75dba29d2ce59fc Component: engine Guillaume J. Charmes 2013-09-18 12:06:10 -07:00
  • 94980938ac Merge pull request #1908 from dotcloud/bump_v0.6.2 Daniel Mizyrycki 2013-09-18 11:21:51 -07:00
  • cf28050cad Updated the dev environment document Upstream-commit: 4054f31471dbb97e3786120baaa863e3a05e7c1a Component: engine Jim Alateras 2013-09-18 12:41:12 +10:00
  • 83b27f0110 Further updates to the dev environment document Upstream-commit: 76a07371c5ceda160f1491a4f6e060dda2f45242 Component: engine Jim Alateras 2013-09-17 21:05:55 +10:00
  • 1482328d42 Further updates to the dev environment document Upstream-commit: 5d364fda3cc4f947487d6782e585d1391782817b Component: engine Jim Alateras 2013-09-17 21:02:57 +10:00
  • e537c86df2 Update the devenvironment document Upstream-commit: 28311f61be35bf92557542ae6ffb4aab11539720 Component: engine Jim Alateras 2013-09-17 19:29:13 +10:00
  • db02ee1460 Updated the dev environment document Upstream-commit: 70b731735c810d9e179837eb8761a44fbe98f391 Component: engine Jim Alateras 2013-09-18 12:41:12 +10:00
  • 9c3ea618a8 Fix #1654 Improve the introduction to repositories flow. Upstream-commit: 67453d6b481200ad487b87d5620ce93602939341 Component: engine Andy Rothfusz 2013-09-17 19:01:11 -07:00
  • 38112bcad2 Merge pull request #1909 from dotcloud/fix-typo-docs Andy Rothfusz 2013-09-17 18:25:59 -07:00
  • 7549ba84c7 Fix minor typo Nick Stinemates 2013-09-17 18:49:47 +00:00
  • ebc85df1e6 Bump version to 0.6.2 Upstream-commit: ca5913ff3ec0648d6ad9887abc6cf986fddee1a2 Component: engine Guillaume J. Charmes 2013-09-17 11:11:39 -07:00
  • bac45adcda Merge pull request #1893 from dotcloud/add-tianon-maintainer Solomon Hykes 2013-09-17 11:00:48 -07:00
  • c56f8710d6 Merge pull request #1898 from dotcloud/smallfix_registry Michael Crosby 2013-09-17 10:27:19 -07:00
  • 57d4184f69 Merge pull request #1897 from dotcloud/update_doc Michael Crosby 2013-09-17 10:21:45 -07:00
  • 42f39a5ca8 Further updates to the dev environment document Upstream-commit: 5797e7e34e3366c9fe65e9d4743014a25910b197 Component: engine Jim Alateras 2013-09-17 21:05:55 +10:00
  • df7599c3c7 Further updates to the dev environment document Upstream-commit: 089a60c2cfcd17287dc79c5c632eb4775003c3e4 Component: engine Jim Alateras 2013-09-17 21:02:57 +10:00
  • 16f525621b Update the devenvironment document Upstream-commit: a99a8386fdf71c5cc0f7757a5b4ef2747f0d1ea8 Component: engine Jim Alateras 2013-09-17 19:29:13 +10:00
  • 588e45b7bc packaging, issue #1647: Add docker groupname on the package release Upstream-commit: dfd0deefbb5325901608c85319dd357146d5370a Component: engine Daniel Mizyrycki 2013-09-16 11:23:58 -07:00
  • c55e3c6610 Information about data persistence Upstream-commit: 2183644578c886e054a81c32b40720eafc2ce2b9 Component: engine Andy Rothfusz 2013-09-16 16:44:54 -07:00
  • e26a79ce37 Prevent panic upon error pulling registry Upstream-commit: e836b0064bc18300ca9213c749f464e52ca9d001 Component: engine Guillaume J. Charmes 2013-09-16 16:18:25 -07:00
  • da2cdf809a Add Tianon to contrib/ maintainers Nick Stinemates 2013-09-16 04:50:53 +00:00
  • cea03fdf23 Fixed HTTP imports. Upstream-commit: c6b40761255c881b8851ac096d5cc59b0c6be729 Component: engine David Sissitka 2013-09-15 18:40:29 -07:00
  • 2e27a64777 Allow multiple volumes-from Upstream-commit: b79bd4e864d53e927a9480374646d5e94d12141c Component: engine Michael Crosby 2013-09-14 20:09:15 +00:00
  • b5842137f7 Update the commit documentation with better example Upstream-commit: 796d7a49f04de73c349d2a09f57922bc30961283 Component: engine Guillaume J. Charmes 2013-09-12 13:26:31 -07:00
  • 8218ba9d63 Merge pull request #1892 from dotcloud/fix-maintainers-files Michael Crosby 2013-09-16 14:41:36 -07:00
  • ea104a3973 Merge pull request #1894 from dotcloud/1891-remove_useless_warnings Michael Crosby 2013-09-16 13:48:17 -07:00
  • f0c74e9f0a Merge pull request #1896 from dotcloud/1885-missing-hostfile Michael Crosby 2013-09-16 11:29:52 -07:00
  • ef0295b560 Only mount hostname files if config exists Upstream-commit: 5a01f7485c6df95f747e08d2cad3d4c934b811bc Component: engine Michael Crosby 2013-09-16 17:53:24 +00:00
  • 6deb994c66 Merge pull request #1849 from dotcloud/better_handle_hostConfig Michael Crosby 2013-09-16 10:48:53 -07:00
  • 613224b496 Don't show network related warnings when networking is disabled Upstream-commit: 40eaa82fc617a474b1325ac22bd1299d3c0e3d48 Component: engine Victor Vieux 2013-09-16 15:58:44 +00:00
  • c157c0dfdc Add MAINTAINERS Nick Stinemates 2013-09-16 04:45:01 +00:00
  • c55f0d3dec Merge pull request #1884 from dotcloud/update-vendored-deps Solomon Hykes 2013-09-13 20:55:06 -07:00
  • 000c3ebd00 Merge pull request #1847 from dotcloud/test-docker-in-docker Solomon Hykes 2013-09-13 20:19:37 -07:00
  • 80d0a74f8b clarify "use" Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a Component: engine Andy Rothfusz 2013-09-13 17:22:53 -07:00
  • 32f8da3a7e Merge pull request #1880 from getvictor/patch-api Andy Rothfusz 2013-09-13 13:28:26 -07:00
  • 9fc7b61184 Merge pull request #1881 from dotcloud/ubuntu-install-instructions Andy Rothfusz 2013-09-13 13:27:58 -07:00
  • 4b16804ae0 Change apt source to http Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be Component: engine Michael Crosby 2013-09-13 19:21:43 +00:00
  • 262f4e57a2 Fixing LxcConf example in docker_remote_api_v1.4.rst Upstream-commit: 102522bcd1e87730394665c5a78f8e8bbcc50b7e Component: engine getvictor 2013-09-13 14:10:05 -05:00
  • 40a7f3c469 Fixed LxcConf example for docker_remote_api_v1.5.rst getvictor 2013-09-13 14:09:05 -05:00
  • 4de754b9f6 Merge pull request #1848 from dotcloud/build-clean Michael Crosby 2013-09-13 10:58:59 -07:00
  • dea87b774e Merge pull request #1716 from eliasp/fixme Michael Crosby 2013-09-13 10:58:28 -07:00
  • ff91aa71a1 Add go.net to vendored dependencies Upstream-commit: 4a707a8800f95c2d7c8ba269da7dcdfaba6acbc6 Component: engine Solomon Hykes 2013-09-13 10:24:38 -07:00
  • a0167b5a29 Merge pull request #1846 from dotcloud/fix_return_error Michael Crosby 2013-09-13 09:44:38 -07:00
  • c2de80738c Merge pull request #1862 from dotcloud/dockerfile-multiline-space Daniel Mizyrycki 2013-09-13 08:52:57 -07:00
  • 5b4ca38251 Updated vendored dependencies Upstream-commit: 6c1c404501d72c5c0ba488689b331ee0e01d5753 Component: engine Solomon Hykes 2013-09-12 20:42:26 -07:00
  • b9d752c34e Merge pull request #1741 from griff/1737_fix_volume_uid_gid Michael Crosby 2013-09-12 10:38:37 -07:00
  • dec68f5c30 Merge pull request #1593 from kyleconroy/master Andy Rothfusz 2013-09-12 10:30:16 -07:00
  • 909728c3a8 Merge pull request #1865 from lgp171188/patch-1 Andy Rothfusz 2013-09-12 10:11:18 -07:00
  • bd04c634f0 Merge pull request #1859 from Bachmann1234/patch-1 Andy Rothfusz 2013-09-12 10:10:49 -07:00
  • bb7df4f70e Update docker.bash script for build -rm Upstream-commit: 1d935c630745248d5851440eb0907cd363cd88d0 Component: engine Michael Crosby 2013-09-12 16:57:10 +00:00
  • efc88e6663 Add rm option to docker build to remove intermediate containers Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd Component: engine Michael Crosby 2013-09-10 18:39:47 +00:00
  • 424f44ba41 Fixed a minor typo Guruprasad 2013-09-12 13:25:05 +05:30
  • 04ac9582d3 hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in Upstream-commit: 45cedefadb444e8d7305defd246c63537fca04df Component: engine Solomon Hykes 2013-09-11 18:38:09 -07:00
  • ec20b18bca Replace multiline with empty string not space Upstream-commit: 1e723bc95a61fb6c46af82557c128d1e95a33a99 Component: engine Michael Crosby 2013-09-11 23:43:55 +00:00
  • a21e18e65f Add documentation Upstream-commit: 082d142024e69a817ed96772ee3057bbdeaa8d7d Component: engine Guillaume J. Charmes 2013-09-11 15:14:33 -07:00
  • de832f166e Merge branch 'master' of https://github.com/dotcloud/docker Upstream-commit: 9dd98df1a3c4115da897b93809d0b004b8fccc1a Component: engine Kyle Conroy 2013-09-11 15:38:52 -07:00
  • eac5eb816d Make StdCopy works with huge amount of data Upstream-commit: e854b7b2e6666d8b47f2c9714ac3bef2320fc40b Component: engine Guillaume J. Charmes 2013-09-11 11:35:09 -07:00
  • 72e85e9acd Add stderr unit test Upstream-commit: 289350e63397bf918fbd75726a6e06f0fe49b81b Component: engine Guillaume J. Charmes 2013-09-09 18:23:03 -07:00
  • 66b0c6b946 Split stdout stderr for non-tty commands Upstream-commit: 8ae5348a51ab6026db29009f109bb3724908f0aa Component: engine Guillaume J. Charmes 2013-09-09 18:14:23 -07:00
  • 2f028893cb Merge pull request #1851 from metalivedev/1601-ec2install Andy Rothfusz 2013-09-11 14:41:43 -07:00
  • f3b949b816 Update hello_world.rst Matt Bachmann 2013-09-11 15:35:05 -04:00
  • 2bbd215a6a Merge pull request #1857 from shin-/master Victor Vieux 2013-09-11 10:52:05 -07:00
  • f64d317995 Fixed push bug Upstream-commit: c6dc90ccb9a77dab9f40c13be7465a759a25885b Component: engine shin- 2013-09-11 19:39:33 +02:00
  • 69cd7cd278 Merge pull request #1726 from dsissitka/1615-2 Michael Crosby 2013-09-11 09:09:48 -07:00
  • 2d267aa7ec Fixed a bug I created when rebasing. Upstream-commit: 71d46eaf029fcc49edade5e7a967909d57e5c723 Component: engine David Sissitka 2013-09-11 01:39:55 -07:00
  • da3c9e0ef2 Replaced leading spaces with tabs. Again. Upstream-commit: f4ba0d42675a4085dfe96543a9265d9caf6b5e85 Component: engine David Sissitka 2013-09-11 01:28:20 -07:00
  • 184c209869 Updated postContainersCreate to use writeJSON. Upstream-commit: d48ea32186cfa069db80d6dd3b79a9d2e0c14c7f Component: engine David Sissitka 2013-09-11 01:26:26 -07:00
  • 29774e010f Replaced leading spaces with tabs. Upstream-commit: 33e4d73629dd2a913e5b8e4c96faba09bcb1bcac Component: engine David Sissitka 2013-09-11 01:07:05 -07:00
  • a591fb2b8f Rebased. Upstream-commit: 07324a37eb7cc6daf32e47a85aedaa03b07586b5 Component: engine David Sissitka 2013-09-11 01:03:17 -07:00
  • 6d9de425d6 Added a status code argument to writeJSON. Upstream-commit: dd49cc45c885de15133a6e547671846e63a0334a Component: engine David Sissitka 2013-09-11 00:23:53 -07:00
  • ee4708b50c Fix #1601 with vagrantless installation instructions. Upstream-commit: 21be3b76e99d0a6a9d9722d6221ee15ea971dbf4 Component: engine Andy Rothfusz 2013-09-10 18:54:13 -07:00
  • 3604478445 Transfer uid and gid to volume. Fixes #1737. Upstream-commit: 9cfbaecfe5b1ccb1ab21c66400f3a1ba1b33da1e Component: engine Brian Olsen 2013-08-30 02:22:08 +02:00
  • 7ba861bda7 hack/make.sh print a warning but don't exit if called outside a correct build environment. Upstream-commit: ebee8f28ac45e7907a35331383f8b9b4ab338353 Component: engine Solomon Hykes 2013-09-10 18:08:02 -07:00
  • ed8387023e Fix typo and add dependency details in hack/PACKAGERS.md Upstream-commit: 03e36caeb12eb5b936de8cec29998c61fc02f037 Component: engine Solomon Hykes 2013-09-10 18:02:33 -07:00
  • 2ea799480f improved hostConfig reload Upstream-commit: f482432a76a898e5d0252b6c5878a0e60290d0a4 Component: engine Victor Vieux 2013-09-10 22:13:15 +00:00