ce6d62db16
Merge pull request #1387 from joevandyk/patch-1
...
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
Upstream-commit: 7c9604e32beea824238c0f2ac055577feb307786
Component: engine
2013-08-05 16:14:57 -07:00
2bc60625b2
Merge pull request #1390 from grobie/clarify-amazon-documentation
...
Clarify Amazon EC2 installation type
Upstream-commit: baa4618e57eadcb320dcd0b93ab2bd0dedee7d5a
Component: engine
2013-08-05 13:26:28 -07:00
e591df1e08
typo: s/connexions/connections
...
Upstream-commit: db0ccaac9b4e9e12d4e33e5d48e437771aaf8dcd
Component: engine
2013-08-03 22:11:59 -05:00
b034acd005
Clarify Amazon EC2 installation type
...
Make clear this documentation is about installing docker on EC2 with the
help of vagrant, which doesn't make it easy to start multiple instances,
instead of plain vanilla EC2 installation.
Upstream-commit: 708cd3458696101a4aa78d4e8086a29158e133cf
Component: engine
2013-08-03 17:31:20 +07:00
a616b1d2ff
Merge pull request #1375 from grobie/patch-1
...
Move note about officially supported kernel
Upstream-commit: b1d994e3b93280bbe55d208c51e4d9fa712f388f
Component: engine
2013-08-02 17:24:15 -07:00
294e6e6582
Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
...
Upstream-commit: b6bff0cbb15535b3d1bc991b975c3df35061aa83
Component: engine
2013-08-02 15:10:57 -07:00
da0dfa9ebd
Move note about officially supported kernel
...
It seems this a general note about kernel issues and not specific to Cgroups or namespaces.
Upstream-commit: 2424480e2ce14d848c041c53cc041aab91308081
Component: engine
2013-08-02 12:24:38 +07:00
fb6e560276
add ufw doc
...
Upstream-commit: 7d0b8c726c0d178291063751ac735d6caebfb45a
Component: engine
2013-07-30 13:47:29 +02:00
7033d58dca
Fix installation link from welcome page.
...
Upstream-commit: 11998ae7d62ee17856ead81ce49409dc63643d62
Component: engine
2013-07-02 16:48:57 -07:00
d5a28f01c8
the kernel needs "swapaccount=1" set - some docs are updated, this one seems to have slipped through
...
Fixes #952
Upstream-commit: 5fc1329b2fac25c85621d819c82253e9481196d4
Component: engine
2013-06-19 14:45:03 -07:00
f73437e29d
Update docs
...
Upstream-commit: 79fe864d9a117193b4dce8b7fe156a55bbadcce6
Component: engine
2013-06-14 10:58:16 -07:00
2fdc41e83d
Remove provider specifc language
...
Upstream-commit: c000ef194c0259bfe631222b19a2bc204281f836
Component: engine
2013-06-04 16:01:38 -04:00
0661d79fa2
Merge pull request #802 from johncosta/ubuntu-1304-add-apt-repository
...
- Documentation: adding missing dependency to the ubuntu linux install page.
Upstream-commit: 479ac9afa7159f2da7c9cb4dd33fef8a4cf85474
Component: engine
2013-06-04 11:55:34 -07:00
f0b09674bb
some installations of ubuntu 13.04 (digital ocean Ubuntu 13.04 x64 Server in this case) require software-properties-common to be installed before being able to use add-apt-repository
...
Upstream-commit: e61af8bc62c84a1bc70d0b323c1b6bf21dddb4b6
Component: engine
2013-06-04 10:40:44 -04:00
82e1f15eb6
Changed some text on the website to include docker-club
...
Fixed a link in the FAQ on the docs
Fixed a detail in the Makefile for pushing the site to dotcloud
Upstream-commit: 38f29f7d0c9cbdb4c458834d403fc128dcce3117
Component: engine
2013-06-03 11:45:19 -07:00
f05f5b2a20
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.
Upstream-commit: b2084a9c599d91fa1460116ef0c8d509d3353103
Component: engine
2013-05-30 01:56:08 -03:00
49e1d5125f
Merge pull request #702 from kim0/patch-2
...
Properly install ppa, avoid GPG key warning. Also closes #715
Upstream-commit: 28a30eda880ceac876c6ce3791672bf1e6b2ebe5
Component: engine
2013-05-28 14:17:59 -07:00
85e0f5a874
Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
...
Upstream-commit: c5f15dcd3de02a10452963a9c56cb2e587972f58
Component: engine
2013-05-24 14:42:00 -07:00
f4c4eec030
Properly install ppa, avoid GPG key warning
...
Upstream-commit: 4e576f047fc8a5a75fa88a66132bdade4f3a1e44
Component: engine
2013-05-24 18:55:32 +03:00
2b0dd49ab1
Avoid hardcoding kernel 3.8 version, allow Ubuntu updates to work
...
Upstream-commit: 8dc2ad2c06fabb6501f0adff80761898bed5bc6f
Component: engine
2013-05-24 17:44:02 +02:00
149569d0df
Re-ordered and re-titled kernel requirement details to match the shortlist
...
Upstream-commit: dbb7b60cfc97dc1b7a1412775475048b6bf18e67
Component: engine
2013-05-23 09:49:53 -06:00
bda804d554
Simplified and clarified kernel install instructions
...
Upstream-commit: e77263010ce882790f12dfcd0841ea784dab0738
Component: engine
2013-05-23 09:47:20 -06:00
7040df6614
added/modifed tittle, description and keywords
...
changed the title prefix to sufix + Documentation
Upstream-commit: 18cb5c9314dbc9a0aa857211b124a3feb85c5274
Component: engine
2013-05-22 17:52:48 -07:00
b99a24c471
Add some details about pre-3.8 kernels
...
Upstream-commit: 6301373c68990e8a92730de23a4da86b3442b4ef
Component: engine
2013-05-17 18:58:00 -07:00
d6855e804f
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
Upstream-commit: 72360b2cdfcfb70e72295b8f8cf7618257ce8826
Component: engine
2013-05-17 18:57:56 -07:00
2c21356473
Mostly changes to the html, moved pages, fixed links.
...
* Moved the introduction page to the en/latest/index.html home of the documentation and pointed all links there
* Fixed a broken link from+to homepage
* Fixed the javascript of the documentation navigation to allow expand and collapse multiple times.
* Fixed the one typo Andy pointed out
Upstream-commit: 8454a86e9733b3eddc6dcd5583bef58785a550d7
Component: engine
2013-05-15 20:00:20 -07:00
68ac829d17
Updated the entire installation section text, checked everything, cleaned up rackspace installation.
...
Upstream-commit: ce35f5d89939a20c7e9a5466f837b1ac919609fc
Component: engine
2013-05-15 16:11:59 -07:00
3a767c12a7
updated the rackspace docs to have more information, and fixed a couple of mistakes
...
Upstream-commit: f074e983bd99a19509f96e235a2f35fbe1cab849
Component: engine
2013-05-12 13:12:44 -04:00
3c131047d1
Added install instructions for RackSpace cloud using Ubuntu 12.04, 12.10, 13.04
...
Upstream-commit: 823bc74935b8f3713c7443c617402334dc5fbda4
Component: engine
2013-05-11 19:03:41 -04:00
e156e85d9d
Update documentation, use docker-latest instead of docker-master
...
Upstream-commit: 87cc8b6058c8cf185825a039d2320af578cb8f8a
Component: engine
2013-05-06 13:26:23 -07:00
01ec1844a4
Update ubuntulinux.rst
...
Upstream-commit: 0fabd390a91ae34d85bb873d05ce7132266ce3a4
Component: engine
2013-05-06 13:11:08 -07:00
d4a3d1d866
Update ubuntulinux.rst
...
Upstream-commit: bbad653b1aedb174500cf7b643ad945bea0d634a
Component: engine
2013-05-06 12:00:39 -07:00
5cff06982a
Fixed remaining issues and conflicts created by last merge.
...
Upstream-commit: 1ddca1948bbfd77ad3c4f0eeda640c39d315d9ae
Component: engine
2013-04-23 12:04:53 -07:00
28e13570bc
Merge remote-tracking branch 'dotcloud/master' into dhrp/docs
...
Conflicts:
docker/docker.go
docs/sources/installation/archlinux.rst
docs/sources/installation/index.rst
docs/sources/installation/ubuntulinux.rst
runtime.go
utils.go
Upstream-commit: 5a5e417d46fe0bcac974e7180f50b0c59a8ec320
Component: engine
2013-04-22 18:44:50 -07:00
5e92f87f4e
Merged changes
...
Upstream-commit: 4031a01af1658225344af04be0dbd4225893c242
Component: engine
2013-04-22 18:38:42 -07:00
469031c87e
Updated Vagrantfile and documentation to reflect new installation path using Ubuntu's PPA, also switched everything to use Ubuntu 12.04 by default.
...
Upstream-commit: 6c8dcd5cbbff2b33f878a32ae3b93abc0d7b9dae
Component: engine
2013-04-22 13:10:32 -07:00
53559b1043
Better title in ubuntu install doc
...
Upstream-commit: 52cedb8a05182c7d6f5e5918453cf356b1efafc8
Component: engine
2013-04-20 18:26:15 -07:00
28df0b2e7a
Merge pull request #422 from shawnsi/arch-docs
...
Arch docs
Upstream-commit: 6909f3911fce031adfcc71842ca71b5043e3e43b
Component: engine
2013-04-20 17:35:43 -07:00
4b4475fccb
Fix Ubuntu install doc
...
Upstream-commit: 1201c418cd6f02ca8c206cfdd4659b8ec2d2f856
Component: engine
2013-04-20 17:31:49 -07:00
3aa701de71
Formatting fix in ubuntu install doc
...
Upstream-commit: 4a9c3a92e1552fab5702eeddc0307f7f87f96496
Component: engine
2013-04-20 17:30:33 -07:00
a6f4f1acf8
Updated ubuntu install
...
Upstream-commit: 0731d1a582b44a18e9bfdf0764d232b46218346b
Component: engine
2013-04-19 20:59:43 -07:00
69774ce2e6
Updated documentation and fixed Vagrantfile
...
Upstream-commit: 8ecde8f9a5dcad23afea013a62d373cef303fa84
Component: engine
2013-04-19 20:57:50 -07:00
15ab010e20
Updating the arch linux installation docs
...
New AUR package name
Adding systemd service unit info
Upstream-commit: 7eda9c64b80ff43af5e90b37a3830615034fefee
Component: engine
2013-04-18 09:20:23 -05:00
0a3b5be4e0
Issue #405 : Documentation for Arch Linux Install
...
Upstream-commit: 45809e9a055defd073bde794026aa611333b7023
Component: engine
2013-04-12 13:25:33 -05:00
38ad5f3006
Fixed a lot of language and small things.
...
Upstream-commit: 81874ad4425ed1a3520944bfcced271041e7b0f4
Component: engine
2013-04-01 19:11:09 -07:00
996e1c5e82
Added a lot of basic instructions on various topics
...
Upstream-commit: 64376481767a6a4a1d2b90b225a6ac5bf6bc16f9
Component: engine
2013-03-29 17:30:10 -07:00
9de6b5992b
Merge remote-tracking branch 'origin/docs'
...
Upstream-commit: 47e5d2f5e1af88f75faa7391fb29644b3254a8ae
Component: engine
2013-03-28 11:12:00 -07:00
33c9b9eb1f
Made changes to incorporate extermal docs.docker.io. Also took out /documentation/ dir so sources are easier accessible and the folder is not redundant on docs.docker.io/documentation/
...
Upstream-commit: 3b71336edcd3798a11ea8a2f9c94b012357b32c3
Component: engine
2013-03-27 16:43:13 -07:00
