Commit Graph

174 Commits

Author SHA1 Message Date
3e2f61eef3 google-compute-engine: fix typos
Upstream-commit: a3ee36b7474c70afdd12fa2210821cb080bc0a07
Component: engine
2014-01-08 00:11:06 -08:00
b057d9da45 Makes sure the GPG key fingerprint is inlined in the doc everywhere.
Instead of `curl $url | apt-get add -` use the ubuntu keyserver and a full
fingerprint to retreive the key. This makes the distribution of the GPG key
more secure an less likely to change even if 3rd party gains access to the
packages repository.

Docker-DCO-1.0-Signed-off-by: Jonas Pfenniger <zimbatm@zimbatm.com> (github: zimbatm)
Upstream-commit: 13ebc68636f922e799d71792748934b8883d2f1f
Component: engine
2014-01-08 01:07:04 +00:00
ec9c950a6c Merge pull request #3430 from lsm5/fedora-official-image
install instructions use unprefixed fedora image
Upstream-commit: b3addb5fb8814c0e76e2115404caef8a4efb393c
Component: engine
2014-01-07 15:12:37 -08:00
dffdf1a269 Merge pull request #3462 from tsaavik/patch-2
Simplified and streamlined Amazon Quickstart
Upstream-commit: 6f8a79c23c7ae80a18fb291c7dd65e12b8a6c037
Component: engine
2014-01-07 15:09:35 -08:00
fc2f70defb Merge pull request #3461 from jbeda/patch-1
Update instructions for mtu flag for Docker on GCE
Upstream-commit: cf8063d1521e7e065e859b3e2f58e52d3b54a0f7
Component: engine
2014-01-07 15:03:19 -08:00
5b993f0514 Fixed #3481 - Added Ubuntu Saucy to installation
Docker-DCO-1.0-Signed-off-by: James Turnbull <james@lovedthanlost.net> jamtur01
Upstream-commit: 97ef8a067c77cb8d15e6e336264c6eb21b25a0fb
Component: engine
2014-01-07 11:46:07 -08:00
dcc35456a2 Tweak formatting for GCE instructions
Upstream-commit: b308e33106832cd4452f473ff0a54c2031070e0a
Component: engine
2014-01-06 10:35:51 -08:00
35ca0566a9 Simplified and streamlined Amazon Quickstart
The amazon quickstart images are EBS backed and include cloudinit. I've personally tested these documentation changes as a new user to Docker.
Upstream-commit: d6ca05f7cb6fd75a77967049c22eac7104d94633
Component: engine
2014-01-06 09:53:58 -08:00
a8ce549c09 Update instructions for mtu flag for Docker on GCE
Upstream-commit: ea762c1a51a7dfbb08294c2b6fa105095dd193b3
Component: engine
2014-01-06 09:29:33 -08:00
d1a2c2d10e install instructions use unprefixed fedora image
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 523f726716fa017b14647b9a70176e2639a71837
Component: engine
2014-01-02 11:29:24 -05:00
a97ab92d81 Implement suggestions
Upstream-commit: 0b3e153588876fdc2bddde2e9064598e26276a09
Component: engine
2014-01-01 12:28:22 +01:00
f1fad2f495 Mention lxc-checkconfig
This is important because the list below is not complete when one build one's own kernel.  Plus it is more robust in the face of changes.
Upstream-commit: 22269894105d8553fc3608fe3f749f5001a37ca0
Component: engine
2014-01-01 00:59:47 +01:00
09f511f43d Merge pull request #3312 from DeX77/master
Installation for FrugalWare
Upstream-commit: 7e720d0a7797698c393ef2a204c87199463ca1a8
Component: engine
2013-12-30 10:34:39 -08:00
0cd52002c8 * s/docker/Docker/
Upstream-commit: d256f3049b36ae1a1dd596535b4a82d265ff9eee
Component: engine
2013-12-27 11:55:57 +01:00
2bbee621e7 + added missing link in index.rst
* some gramatic and spelling fixes

Thx jamtur :)
Upstream-commit: 3edbf416bfaed2c7bacc3c5ef572efb59b4e2082
Component: engine
2013-12-22 00:00:20 +01:00
b028910bf6 Installation for FrugalWare
Upstream-commit: 158e3d60ec016778b2a2615885f6a880509644f3
Component: engine
2013-12-21 23:38:13 +01:00
652202543c Update MTU work-around to use the new -mtu flag
Upstream-commit: cdd14b1a31603e602ab36522582b4356264ccb60
Component: engine
2013-12-20 16:19:35 -08:00
118dcafff9 Added a note about a networking work around.
An additional flag to limit the networking MTU is required in three Compute Engine zones for reliable networking from inside the docker container. Added a warning to that effect to the QuickStart guide.
Upstream-commit: 37ed178611622da42e3a4a0aed2288b00b4eb208
Component: engine
2013-12-20 16:06:28 -08:00
ddd720195c Merge pull request #3228 from maztaim/patch-1
Update binaries.rst
Upstream-commit: f630fbc7cf76fb123efff855de465a140e470754
Component: engine
2013-12-17 13:10:08 -08:00
2b1ed3c336 Fedora first letter capitalize and misc. rewording
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 25be0b1e987934ca39085894730b54f4bbcd8ad2
Component: engine
2013-12-17 11:32:40 -06:00
3fa358de88 docker and docker-io conflict update for epel
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 30b4a0f76a63f24f96ba588216990f0ae7cd60a2
Component: engine
2013-12-17 10:56:31 -06:00
fccc41956a update fedora doc: docker and docker-io conflict
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 7d95145b76decc511bc78d887ec3843bd182e58a
Component: engine
2013-12-17 10:33:52 -06:00
f78ee734d9 Update binaries.rst
Along with the kernel requirement, you need a working copy of lxc.  When trying to start using "/docker -d", received error 'initapi: exec: "lxc-start": executable file not found in $PATH'
Upstream-commit: 67215250686687134788c4826f3d9eccb9981344
Component: engine
2013-12-16 12:04:29 -05:00
80136f3a4a keeping rhel page sorta in sync with fedora
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 8874f2aef9ed12574160394fd7a6a254c0ef0526
Component: engine
2013-12-11 18:26:17 -06:00
8caad93e85 remove step numbers, keep consistent with fedora
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: e8ec3dba7b1eb9254a04c852ffe7d98d10d0d476
Component: engine
2013-12-11 18:21:52 -06:00
b20c07a32a Merge pull request #3176 from lsm5/rhel-docs
Rhel docs
Upstream-commit: d3292078dc501b8afc94c87554184789757586e7
Component: engine
2013-12-11 15:58:42 -08:00
256dcd7255 more typo corrections
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 44984602c7c7460454531c22ee4dfab2a34fa334
Component: engine
2013-12-11 16:36:14 -06:00
51019ea44e some typo corrections
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: d534e1c3a1e00786d63e9dbeffceb6ab7f51c92b
Component: engine
2013-12-11 16:20:54 -06:00
18d434e8aa rhel page keywords update
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: db3019d50b7a38dd52d8ad959017c63b04f11462
Component: engine
2013-12-11 16:00:46 -06:00
f68960fa0e rhel description update
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 42c38bf34dff7a5af4c75646b7252d3ecbdd334a
Component: engine
2013-12-11 15:59:35 -06:00
17c7de8491 rhel page only for rhel
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 31961ccd94bc2d0941d3062591206a58b3b451a1
Component: engine
2013-12-11 14:36:12 -06:00
c55d5472f2 rhel docs update
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: eec48f93a36873b8255c1c533b0d2bfbd742f9fa
Component: engine
2013-12-11 14:34:51 -06:00
a47c99e75e Use https to get the install script
Upstream-commit: 81fc368a6d70ef369bd16a3c090c6910851faacf
Component: engine
2013-12-11 11:27:36 -08:00
23da3f2ced archlinux installation doc: correct some details
1. The AUR package is called docker-git, not lxc-docker-git.

2. According to the official community package, docker depends on
   sqlite.

3. 02ef8ec (Update archlinux.rst as packages have changed, 2013-12-06)
   updated the installation instructions, but left behind residual
   wording about the AUR package not being officially supported; the
   community repository is officially supported.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Upstream-commit: f832b76bdfafe3108af61d00171567da02482222
Component: engine
2013-12-08 15:36:02 +05:30
6ca0e7d37f Merge pull request #3094 from tang0th/patch-1
Update archlinux.rst as packages have changed
Upstream-commit: 6fa1463614b810d725763a20aec1fb4b8c4d1c22
Component: engine
2013-12-06 14:18:31 -08:00
f1753d066b Merge pull request #3071 from lsm5/fedora-docs-update
use mattdm/fedora in fedora doc and other cosmetic changes
Upstream-commit: d75fc6e529a4a7279829f4229c474adf29514b8b
Component: engine
2013-12-06 11:25:10 -08:00
8dbc8f134f Update archlinux.rst as packages have changed
The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed.
Upstream-commit: 02ef8ec3ca1a9b16b905b671ade74cf24d11bb3a
Component: engine
2013-12-06 15:47:24 +00:00
7e3fb2e06b specific kernel config
Upstream-commit: a69bb25820df8951151c8c6cb5952ba5496463db
Component: engine
2013-12-05 23:54:23 -08:00
6671f362c6 Add debian mirrors. Fixes #3045.
Upstream-commit: 58b75f8f29b5fff388ec3d8d84249e122462c137
Component: engine
2013-12-05 18:08:56 -08:00
900b5e498f Merge pull request #3069 from proppy/patch-1
docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: f9147effac69e9746b6aae5af9d37bf437aa6c2d
Component: engine
2013-12-05 17:40:42 -08:00
f9d6ff33ee include Red Hat Enterprise, should have part of #3011
oops, forgot the index!
Upstream-commit: a96bf7439774d905f72e835218c72a5b45da37c0
Component: engine
2013-12-05 14:34:10 -08:00
89905dc61d Merge pull request #3011 from goldmann/rhel_instructions
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS
Upstream-commit: cc0466bb685ad9c393e282860734282659a4b409
Component: engine
2013-12-05 14:30:31 -08:00
9597f3f794 separate block for yum update docker
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 7ab4f37d6084c98e1f725be4cc88ea76bf952eb7
Component: engine
2013-12-05 16:11:33 -06:00
b3835c5b32 add unofficial header back, yum update docker
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 5d022f04453d3bac2e17b8622f013420778e8d5b
Component: engine
2013-12-05 16:08:08 -06:00
d47883ca6a yum upgrade on fedora not required before install
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: 61fbf3d8e27541882ff7c446a7f0edfb4ed03d82
Component: engine
2013-12-05 14:21:03 -06:00
3f0ab3c931 use mattdm/fedora in fedora doc and other cosmetic changes
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
Upstream-commit: f49eb29497620de597f4690a29957f44341f3673
Component: engine
2013-12-05 14:03:17 -06:00
f81857be89 Merge pull request #3024 from jamtur01/ubunturepo
Added note about Ubuntu curl installation
Upstream-commit: 4188cd6bcd6d078ebf2bc72d5685970965453a96
Component: engine
2013-12-05 11:27:46 -08:00
94326d728b docs/installation/google: add enabling Google Compute Engine step
Upstream-commit: 5a17c208cd4858a21d38b09e60ee8199880f02bb
Component: engine
2013-12-05 09:43:08 -08:00
26d53f3ec4 Merge pull request #2834 from fj/topic/clarify-aws-instructions
Fix installing-on-AWS workflow description
Upstream-commit: 9dfc7bc36f51972ade2c6325b452f997f1583a4a
Component: engine
2013-12-04 17:25:35 -08:00
86c79e6a69 Merge pull request #2886 from jamtur01/fedora_community
Updated Fedora docs
Upstream-commit: 5dab47a475fe64d11834133d0689104b4e4c57ba
Component: engine
2013-12-04 17:12:00 -08:00