docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/docker/docker.github.io

This commit is contained in:
John Mulhausen 2016-10-04 15:38:45 -07:00
parent 55e31bb0f6 7480dc4e2a
commit d2cc9fe885
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/installation/linux/ubuntulinux.md
View File

@ -16,7 +16,6 @@ title: 'Installation on Ubuntu '
Docker is supported on these Ubuntu operating systems: Docker is supported on these Ubuntu operating systems:
- Ubuntu Xenial 16.04 (LTS) - Ubuntu Xenial 16.04 (LTS)
- Ubuntu Wily 15.10
- Ubuntu Trusty 14.04 (LTS) - Ubuntu Trusty 14.04 (LTS)
- Ubuntu Precise 12.04 (LTS) - Ubuntu Precise 12.04 (LTS)
@ -83,10 +82,6 @@ packages from the new repository:
deb https://apt.dockerproject.org/repo ubuntu-trusty main deb https://apt.dockerproject.org/repo ubuntu-trusty main
- Ubuntu Wily 15.10
deb https://apt.dockerproject.org/repo ubuntu-wily main
- Ubuntu Xenial 16.04 (LTS) - Ubuntu Xenial 16.04 (LTS)
deb https://apt.dockerproject.org/repo ubuntu-xenial main deb https://apt.dockerproject.org/repo ubuntu-xenial main
@ -116,10 +111,9 @@ packages from the new repository:
### Prerequisites by Ubuntu Version ### Prerequisites by Ubuntu Version
- Ubuntu Xenial 16.04 (LTS) - Ubuntu Xenial 16.04 (LTS)
- Ubuntu Wily 15.10
- Ubuntu Trusty 14.04 (LTS) - Ubuntu Trusty 14.04 (LTS)
For Ubuntu Trusty, Wily, and Xenial, it's recommended to install the For Ubuntu Trusty, and Xenial, it's recommended to install the
`linux-image-extra-*` kernel packages. The `linux-image-extra-*` packages `linux-image-extra-*` kernel packages. The `linux-image-extra-*` packages
allows you use the `aufs` storage driver. allows you use the `aufs` storage driver.

2
machine/drivers/aws.md
View File

@ -72,6 +72,7 @@ You can use environment variables:
- `--amazonec2-use-ebs-optimized-instance`: Create an EBS Optimized Instance, instance type must support it. - `--amazonec2-use-ebs-optimized-instance`: Create an EBS Optimized Instance, instance type must support it.
- `--amazonec2-ssh-keypath`: Path to Private Key file to use for instance. Matching public key with .pub extension should exist - `--amazonec2-ssh-keypath`: Path to Private Key file to use for instance. Matching public key with .pub extension should exist
- `--amazonec2-retries`: Set retry count for recoverable failures (use -1 to disable) - `--amazonec2-retries`: Set retry count for recoverable failures (use -1 to disable)
- `--amazonec2-userdata`: Path to custom User Data file.
#### Environment variables and default values: #### Environment variables and default values:
@ -102,6 +103,7 @@ You can use environment variables:
| `--amazonec2-use-ebs-optimized-instance` | - | `false` | | `--amazonec2-use-ebs-optimized-instance` | - | `false` |
| `--amazonec2-ssh-keypath` | `AWS_SSH_KEYPATH` | - | | `--amazonec2-ssh-keypath` | `AWS_SSH_KEYPATH` | - |
| `--amazonec2-retries` | - | `5` | | `--amazonec2-retries` | - | `5` |
| `--amazonec2-user-data` | `AWS_USERDATA` | - |
## Default AMIs ## Default AMIs