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
938c440dbd
docs/installation: add google compute engine quickstart
...
Upstream-commit: 3df5d120de4f42cc208283bf78b26ca5b21c6776
Component: engine
2013-12-04 12:25:22 -08:00
8fd397a50c
Updated Fedora docs
...
* Added Fedora installation instructions
Upstream-commit: 45567f2209d3450142ae8042f674269902d58e3b
Component: engine
2013-12-03 16:55:55 -05:00
1f27c8a370
Added note about Ubuntu curl installation
...
Upstream-commit: 64439505c7801214d4e01941c2e92d64261ab137
Component: engine
2013-12-03 14:37:01 -05:00
9b091fc10b
Instructions on how to install Docker on Red Hat Enterprise Linux / CentOS.
...
Upstream-commit: 682cf48d1db0851789b593db732ed3801e765d56
Component: engine
2013-12-03 11:25:53 +01:00
1ba0ef805d
Fixes broken RST links; clarifies AWS instructions
...
Upstream-commit: 6c70d23e0d850b31fce0e658ad9ddd7a167bcdcb
Component: engine
2013-12-02 17:55:42 -05:00
22aa07cf7a
Reformats source text to proper widths
...
Upstream-commit: c9432cf51aea9351cc88791036b986e6662a49b8
Component: engine
2013-12-02 17:55:42 -05:00
910f11878c
Arch docs: Added lxc-docker-nightly AUR package, modified deps
...
lxc-docker-nightly installs latest build. Removed go from dependencies, as it is not needed in lxc-docker and lxc-docker-nightly. The -git package will flag go as a dependency upon installation.
Upstream-commit: 682a188ead44e93ac3d5cc53c708808fa7d2fe4f
Component: engine
2013-11-27 10:25:30 -06:00
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
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
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
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
2136e5ee7f
Tidied up Ubuntu installation documentation
...
Upstream-commit: a74b512540d24c89b64ca62933f4512c4804f3ed
Component: engine
2013-11-26 00:58:17 -05:00
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
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
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
e6fb344369
Update the Gentoo installation docs for 0.7+
...
Upstream-commit: 4049359beeb8a253f07e6dbac213391a7b39f362
Component: engine
2013-11-25 22:40:24 -07:00
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
30ac426721
Merge pull request #2860 from jamtur01/fedora2
...
Updated Fedora docs with simple placeholder
Upstream-commit: 5ff74e268d7dfddfa928d00221763b05d2cbfd61
Component: engine
2013-11-25 20:59:15 -08:00
47f399ed6b
Updated Fedora docs
...
* Added warning to Fedora docs
Upstream-commit: 5242a49f3fe2c18ca38be4798869cdc7c306af22
Component: engine
2013-11-25 22:51:38 -05:00
a9b6188d0b
Merge pull request #2858 from jamtur01/fedora
...
Added Fedora skeleton
Upstream-commit: 688e86c6256c31f283f58f353b832aeea8dfcf5d
Component: engine
2013-11-25 19:10:50 -08:00
62617e06d0
Added Fedora skeleton
...
Upstream-commit: 750d2d8d07069c54c0fbddf4ccd2ba10e9ba9dc9
Component: engine
2013-11-25 22:06:18 -05:00
7102c4c81c
Docs: update install pages (ubuntu and kernel requirements) to reflect the optional nature of AUFS
...
Upstream-commit: aaefb8c07cc39735250b0304f73f8cb0e19662bc
Component: engine
2013-11-26 02:45:32 +00:00
e6a444ec3b
Change to documentation for AWS AMI request
...
Hi guys, it just might be me, but clicking the AMI from http://cloud-images.ubuntu.com/locator/ec2/ is broken to me. So I just did it via the normal Create Instance Wizard.
I just though some people might have the same issue.
Sorry if my markdown for links is screwed up, I went by the examples, since I'm used to the `[]()` traditional one.
Cheers.
Upstream-commit: aeb304b37c190e7fab60c0db946d1fd5d8e9e9f3
Component: engine
2013-11-19 17:50:38 +00:00
b666bf948d
Fixes #2701 . Adds security section.
...
Upstream-commit: d33ffe44a9f09b0e0aedf162ee17076571479003
Component: engine
2013-11-15 18:12:35 -08:00
b2bdca3ec2
Merge pull request #2712 from makinacorpus/master
...
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
2013-11-15 10:33:41 -08:00
a905d364a8
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
...
Upstream-commit: 8145e57cee6390bb27d7fb07fe5f572affe5d0cd
Component: engine
2013-11-13 10:29:29 -08:00
ab0419261e
Vagrantfile updates.
...
- Remove the overrides config.vm.box and config.vm.box_url and use
the same values for all providers.
- Use the same private key path for all providers. It is still possible
to set a different private key path through the environment variable
SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
instance type of instead of hard coding the AWS instance type as
't1.micro'. 't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
API tools. This allows people who already have the EC2 tools set up
correctly to use 'vagrant up' with less environment configuration
than before.
- Rewrite the provisioning code. The goal is to be idempotent and to
correctly install docker for all providers instead of just virtualbox.
It will conditionally install the virtualbox guest additions if
virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
Upstream-commit: ccbb5d34927dc1905984bead3ebb576c0ea20960
Component: engine
2013-11-10 23:39:26 -08:00
7eaaa6080e
(doc) Update ubuntulinux.rst
...
small grammar changes - hopefully not worse than original :)
Upstream-commit: 4d5ecdbeb4e428d92c5a0089378f7bae9b3ca3d9
Component: engine
2013-11-05 12:08:56 -07:00
b09631ee21
Fix typo
...
Upstream-commit: 2cac81393715e6a748b3a2316d5163604497b26c
Component: engine
2013-11-04 22:36:57 -08:00
c444529939
Update windows.rst
...
Added further information regarding how to access BIOS menus on Windows machines (laptops). My laptop required restarting to find the options and this information will undoubtedly help other users.
Upstream-commit: db2e2e831ba45f173591766160699ec0b0c77f0d
Component: engine
2013-11-01 13:59:25 +00:00
b9f7264616
Fix typo
...
Upstream-commit: 45d94944f3afe32d04eb31faa0cd9a129383f42c
Component: engine
2013-10-28 02:45:12 +03:00
438bef9430
c&p improvement for 13.04
...
first line killed sources list
Upstream-commit: bc39ac71e66327aa73c44633b374ef75630909dc
Component: engine
2013-10-17 10:07:12 +02:00
e2a6017ff6
make copy paste user friendly
...
copying only the first line killed my sources.list file
Upstream-commit: 2110b3cca80da253d2fd7443480509a3b58a19e2
Component: engine
2013-10-17 09:31:35 +02:00
2c8dcaacd9
Revert "Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example."
...
This reverts commit f4c17a202b5f6021d48c3cb3342c37607b509630.
Upstream-commit: dab84f7e8bc1647f70782731e797fd827c7ce42a
Component: engine
2013-10-16 14:38:24 -07:00
