206 Commits

Author SHA1 Message Date
Solomon Hykes 4205b6bb1d Merge branch 'master' into builder_server-2 2013-05-30 14:09:42 -07:00
Guillaume J. Charmes 28d5b2c15a Update docker build docs 2013-05-30 12:35:19 -07:00
Solomon Hykes 5324614410 Merge pull request #747 from riccieri/patch-1
+ * Documentation: add IP forwarding config to archlinux guide
2013-05-30 11:59:53 -07:00
Solomon Hykes 2ed1092dad * Documentation: removed 'building blocks' for now. 2013-05-30 11:26:47 -07:00
Renato Riccieri Santos Zannon b2084a9c59 Add IP forwarding config to archlinux guide
I had this small issue when following this guide on my Arch box, and I don't think it is specific to any configuration I have.
2013-05-30 01:56:08 -03:00
Guillaume J. Charmes 92939569ab Update build doc 2013-05-29 11:53:44 -07:00
Guillaume J. Charmes d97fff60a9 Update docker build docs 2013-05-29 11:50:49 -07:00
Solomon Hykes 83db1f36e3 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-28 19:39:20 -07:00
Solomon Hykes 24ddfe3f25 Documented who decides what and how. 2013-05-28 19:39:09 -07:00
Guillaume J. Charmes f65327555e Merge pull request #731 from dotcloud/change_containersPs_containersJson_api-feature
* API: rename containers/ps to containers/json
2013-05-28 15:44:20 -07:00
Solomon Hykes 522f399d68 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-28 14:57:50 -07:00
Solomon Hykes 326faec664 De-duplicated contribution instructions. The authoritative instructions are in CONTRIBUTING.md at the root of the repo. 2013-05-28 14:57:36 -07:00
Thatcher 28a30eda88 Merge pull request #702 from kim0/patch-2
Properly install ppa, avoid GPG key warning. Also closes #715
2013-05-28 14:17:59 -07:00
Thatcher f3cc1d985e Merge pull request #733 from meejah/master
Documentation: Use add-apt-repository instead of editing sources.list
2013-05-28 13:55:11 -07:00
Andy Rothfusz 235ae9cd43 Merge pull request #709 from dhrp/links-to-kernel-doc
Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
2013-05-28 12:07:46 -07:00
meejah 444f7020cb Add sudo to commands. 2013-05-28 10:56:26 -06:00
meejah 525080100d Use Ubuntu's built-in method to add a PPA repository, which correctly handles keys for you. 2013-05-28 10:54:32 -06:00
Victor Vieux 4f9443927e rename containers/ps to containers/json 2013-05-28 16:08:05 +00:00
Mark McGranaghan 7d6ff7be12 Fix attach API docs. 2013-05-28 06:27:12 -07:00
Guillaume J. Charmes d3b9733507 Merge pull request #657 from offby1/master
Minor tweaks to python_web_app.rst
2013-05-24 19:19:32 -07:00
Solomon Hykes df23a1e675 * Registry: specified naming restrictions for usernames and repository names 2013-05-24 18:58:24 -07:00
Thatcher Peskens c5f15dcd3d Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst 2013-05-24 14:42:00 -07:00
Victor Vieux d7b01c049d bump to master 2013-05-24 16:50:16 +00:00
Victor Vieux 92e4a51965 use -H 2013-05-24 16:49:18 +00:00
kim0 4e576f047f Properly install ppa, avoid GPG key warning 2013-05-24 18:55:32 +03:00
kim0 8dc2ad2c06 Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work 2013-05-24 17:44:02 +02:00
Victor Vieux 9ebfcc9a15 bump to master 2013-05-24 12:17:44 +00:00
Victor Vieux 13f1939a63 switch to default 127.0.0.1, and mixed the two flags in one. -h 2013-05-23 16:09:28 +00:00
Solomon Hykes dbb7b60cfc Re-ordered and re-titled kernel requirement details to match the shortlist 2013-05-23 09:49:53 -06:00
Solomon Hykes e77263010c Simplified and clarified kernel install instructions 2013-05-23 09:47:20 -06:00
Solomon Hykes 2cf29893b3 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:33:34 -06:00
Andreas Tiefenthaler 9e0427081e Fixing two typos in the run help 2013-05-23 18:09:59 +03:00
Solomon Hykes bc3675d471 Merge branch 'master' of ssh://github.com/dotcloud/docker 2013-05-23 09:01:40 -06:00
Thatcher 422edd513a Merge pull request #683 from rogaha/doc_meta_info_update
Looks good. Thanks!  Closes #637
2013-05-22 19:09:32 -07:00
rogaha 18cb5c9314 added/modifed tittle, description and keywords
changed the title prefix to sufix + Documentation
2013-05-22 17:52:48 -07:00
Eric Hanchrow 056698b676 Use 127.0.0.1 instead of hostname in the "access the web app" section. 2013-05-22 12:54:50 -07:00
Eric Hanchrow b4198de6bf Merge remote-tracking branch 'upstream/master'
Conflicts:
	docs/sources/examples/python_web_app.rst
2013-05-22 12:52:14 -07:00
Victor Vieux 800b401f0b improved doc and usage 2013-05-22 16:15:52 +00:00
Ken Cochrane 1ccc7bdd90 Merge pull request #668 from christophercurrie/patch-1
- Documentation: Fix typos in the python web app example docs.
2013-05-22 07:52:46 -07:00
Victor Vieux 949a649cc2 fix content type in doc 2013-05-22 13:49:12 +00:00
Christopher Currie 5818813183 Apparent typos in the docs. 2013-05-21 21:45:27 -06:00
Guillaume J. Charmes 218812eb3c Update docker builder doc 2013-05-20 17:52:39 -07:00
Eric Hanchrow 3a9ef5f9bb Install curl; nix stray backslash; use proper IP address 2013-05-20 16:31:39 -07:00
Francisco Souza 8291f8b85c docs/remote_api: remove trunc_cmd from /containers/ps example
Apparently, this parameter does not exist anymore.
2013-05-19 11:57:45 -03:00
Phil Spitler ea7fdecd41 Fixed typo in remote API doc 2013-05-19 09:37:02 -03:00
Ken Cochrane 66e9f155c3 Merge pull request #632 from jpetazzo/626-kernel-docs
+ Documentation: Added a section for Kernel requirements to the Docker Docs.
2013-05-18 07:53:45 -07:00
Thatcher Peskens 537cce16f2 Added a "we are hiring" to the frontpage of the docker website, and fixed two broken links in the docs. 2013-05-17 19:35:46 -07:00
Jérôme Petazzoni 6301373c68 Add some details about pre-3.8 kernels 2013-05-17 18:58:00 -07:00
Jérôme Petazzoni 72360b2cdf Add information about kernel requirements
This page will be helpful for people who:
- want run run a custom kernel
- want to enable memory/swap accounting on Debian/Ubuntu
2013-05-17 18:57:56 -07:00
Gareth Rushgrove 55dd0afb5d add instructions for using docker with puppet 2013-05-17 17:08:37 +01:00