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
b33972f66c
Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.), thus making it an official script and moving it to hack/
...
Upstream-commit: 94bf5b00112890ed84c38b9840802fa0142b507b
Component: engine
2013-10-11 00:53:15 -06:00
0aae080c92
Merge pull request #2144 from shamrin/patch-5
...
document what `vagrant up` is actually doing
Upstream-commit: 0367032bd174b279eb24f53b277f352833601bf4
Component: engine
2013-10-09 17:42:37 -07:00
1671af4f28
document what vagrant up is actually doing
...
* don't mention outdated PPA that Vagrantfile doesn't use
* point to official Ubuntu installation instructions that Vagrant appears to be following; should be future proof
Upstream-commit: 37df1d92d8d2b167bb90bb82c086b947371d7497
Component: engine
2013-10-09 15:05:09 +04:00
65b5bca147
Fix #2115 Clean AUFS references. Also fixes some links to client libraries and mongo example.
...
Upstream-commit: f4c17a202b5f6021d48c3cb3342c37607b509630
Component: engine
2013-10-08 17:33:19 -07:00
6087f9fa5b
Merge pull request #2060 from mastahyeti/patch-1
...
Add `apt-get install curl` to Ubuntu docs
Upstream-commit: 37c4513cf91c73c01f8ebdf148c22f157499e592
Component: engine
2013-10-02 16:46:00 -07:00
742265d87b
Update ubuntu docs to use wget instead of curl
...
Ubuntu doesn't come with curl.
wget instead of curl
nicer wget syntax
remove /dev/null
Upstream-commit: 0f830aa431b513d5ac2ee4f9e1239d860bbb4a01
Component: engine
2013-10-02 16:27:34 -06:00
f1f4164997
Remove Gentoo install notes about #1422 workaround
...
Upstream-commit: 5f05cb481760d551dcc3607b3c4dd48897b59cbd
Component: engine
2013-10-02 16:06:22 -06:00
d8c814f4ca
Update archlinux.rst
...
Upstream-commit: fb46d911c204ddda381325c5f1e43277b7b231c2
Component: engine
2013-10-01 09:33:12 +10:00
7bb18042ef
Update archlinux.rst
...
The /etc/sysctl.conf file is deprecated
https://www.archlinux.org/news/deprecation-of-etcsysctlconf/
Upstream-commit: 88f710f0e79eafe469e09a3ea990bdbe0c7d0a52
Component: engine
2013-09-30 22:44:09 +10:00
07130a5623
Merge pull request #2000 from tianon/deprecated-docker-latest-tgz
...
Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
Upstream-commit: 06c1f000e8791b9cc62eeb2e5edbeeb326a03de6
Component: engine
2013-09-25 13:47:48 -07:00
ba85aaa194
Update Gentoo installation documentation now that we're in the portage tree proper
...
We're officially a first-class Gentoo citizen now, which is very exciting. Many thanks to @gregkh for helping us get here.
I started just adapting sections of language in this document, and realized several bits needed to just be rewritten entirely to be more clear.
Upstream-commit: d06116d2e8a70477b3d8b02cd9e57f7465edc0ce
Component: engine
2013-09-24 23:26:36 -06:00
c149784acb
Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
...
Upstream-commit: 595210a3706ecad29c03b3c6753794440b18f992
Component: engine
2013-09-24 21:25:45 -06:00
fa2129e045
Merge pull request #1932 from jcassee/patch-1
...
Download Ubuntu 13.04 repository key over HTTPS
Upstream-commit: 7e60a6b1ea946e942b6c592d0c4930fd01ae5bf4
Component: engine
2013-09-19 13:41:51 -07:00
e372fe8afc
Download Ubuntu 13.04 repository key over HTTPS
...
Upstream-commit: 5c9213258a7537e9baf4eb343bdd03fe29e085f4
Component: engine
2013-09-19 21:14:39 +02: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
2013-09-19 11:49:43 -06:00
80d0a74f8b
clarify "use"
...
Upstream-commit: cd289cc10ccefea72206a6f262e978c346c6679a
Component: engine
2013-09-13 17:22:53 -07:00
4b16804ae0
Change apt source to http
...
Upstream-commit: 74daeccec580c27c33c982cd246afc537f2804be
Component: engine
2013-09-13 19:21:43 +00:00
424f44ba41
Fixed a minor typo
...
Changed "You need to enable namespaces and cgroups, to the extend of what is needed to run LXC containers" to "You need to enable namespaces and cgroups, to the extent of what is needed to run LXC containers"
Upstream-commit: 718b1f9fe74f3a26881e462b3e9e91a93232568b
Component: engine
2013-09-12 13:25:05 +05:30
ee4708b50c
Fix #1601 with vagrantless installation instructions.
...
Upstream-commit: 21be3b76e99d0a6a9d9722d6221ee15ea971dbf4
Component: engine
2013-09-10 18:54:13 -07:00
cab30800ec
Update Gentoo docs to reflect the package name change from app-emulation/lxc-docker to app-emulation/docker as discussed in today's #docker-meeting
...
Upstream-commit: d368c2dee99b35830392938a783137f344e5b89a
Component: engine
2013-09-05 13:36:56 -06:00
5d9b381364
Reformat Gentoo install instructions to 80 columns
...
Upstream-commit: 82dd417ef6966b0f3d812122c18420feb64f49a7
Component: engine
2013-09-05 13:36:16 -06:00
caf639fe57
Fix memory recommendations (Byte, not bit)
...
Upstream-commit: fdf1fccd3eec7b534b8423fe3ea5b6e116b233fa
Component: engine
2013-09-05 10:40:11 +02:00
b0525903e4
Merge pull request #1801 from vcoisne/master
...
Add step to docker installation using vagrant (Mac, Linux)
Upstream-commit: f0cdbaa6c8810954c1e41a07ba78e03305c1cfa2
Component: engine
2013-09-04 18:15:22 -07:00
9ce0173846
Add step to docker installation using vagrant (Mac, Linux)
...
Upstream-commit: ad04cacd28da1557324b8ad6fb53b7284e8bf866
Component: engine
2013-09-04 17:47:18 -07:00
99fc9c9d22
fixed docs for installing binary
...
Upstream-commit: 62823cfb97ec35e59833fd4723c392685d55827c
Component: engine
2013-09-05 00:06:41 +02:00
7b3fcf5ca5
Typo
...
Upstream-commit: 396274fa6db88466fef0b1a5e314ba5b077cd3f2
Component: engine
2013-09-04 21:56:51 +02:00
a2ac8a8fdc
Add Gentoo documentation
...
Upstream-commit: 9ce1d02ef6b0593861809248307d058656f56304
Component: engine
2013-09-04 02:59:18 -06:00
d95a8ab02c
Merge pull request #1704 from dhrp/ubuntu-install-finger-fingerprint
...
added apt-key finger tip and fingerprint in ubuntu installation page
Upstream-commit: 8ee4473d923eb5fc098e3ef27c8b83397c1ea492
Component: engine
2013-08-30 16:15:19 -07:00
bc42da0604
Fix #1685 : Notes on production use. General installation cleanup.
...
Upstream-commit: b1eae313ad7d28142c7e0a8a60e3961bed0c84f0
Component: engine
2013-08-28 17:26:10 -07:00
f47e456912
added apt-key finger tip and fingerprint in ubuntu installation page
...
Upstream-commit: 466a88b9a8331154730551c0009b67cded83ba58
Component: engine
2013-08-27 19:59:36 -07:00
2d98a967b5
Merge pull request #1698 from metalivedev/1684-Cleanup
...
Fix #1684 : Cleanup introduction, working with repos, "use" index.
Upstream-commit: 128893062b5b479d64dbcc62e16b66584f24b16b
Component: engine
2013-08-27 18:15:06 -07:00
e74c0d800f
Fix #1684 : Old Welcome is now Introduction. Working with Repos now follows Builder.
...
Clean up some doc build errors. Removed old Manifesto. Tweaked layout javascript
to allow direct link from first and last index elements.
Upstream-commit: c627ff6e209ac1f660a49371d4f6bd710470aacb
Component: engine
2013-08-27 14:29:49 -07:00
b70dc614ff
Troubleshooting windows installation section
...
Upstream-commit: f861c493bf4d391f1721f536e86da4fa007fb7f0
Component: engine
2013-08-27 11:19:32 -07:00
f620f56abe
Change fetching of gpg key from http to https
...
Or was there any reason to fetch using http?
Upstream-commit: 4440bde0ebffcb31025fd9f3db8e4275b77332b1
Component: engine
2013-08-26 11:45:15 +02:00
f10523fade
Merge pull request #1641 from dotcloud/docs-0.6-gpg-key
...
Docs 0.6 gpg key
Upstream-commit: e2594d162e8c2c60dc4741a0519ce09148a9e87c
Component: engine
2013-08-23 13:14:21 -07:00
60812a84c0
Added adding the gpg key
...
Upstream-commit: ebb9b5e85be296fd73f4d64e61dfc87fe0c3ae72
Component: engine
2013-08-23 12:56:03 -07:00
82a09e242f
Added line on top of ubuntulinux announcing change in 0.6
...
Added lines on top of vagrant installs
Upstream-commit: 091fb892948abee1ad5451ee6c9d7dd540d88780
Component: engine
2013-08-23 11:45:52 -07:00
d544e9592e
Merge pull request #1637 from dhrp/change-docs-ubuntu-sources
...
Updated the docs to reflect we no longer use Launchpad and host our own
Upstream-commit: 3ebda17f0f050c6aa1dbb7eec5774ad9e603b022
Component: engine
2013-08-23 11:05:59 -07:00
8aac574cd3
Updated the docs to reflect we no longer use Launchpad and host our own repository.
...
Upstream-commit: f753dfe6b3d3a8e4d770ae73e947e2fe339df536
Component: engine
2013-08-23 10:41:53 -07:00
fd36c14020
Fix #1517 , #1521 by adding sudo to examples and installation.
...
Upstream-commit: d4eab77f0c604e10f63519833dc25fbd5a3419bf
Component: engine
2013-08-14 16:21:36 -07:00
