mirror of https://github.com/docker/docs.git
redhat: updated docs to explain base operating systems
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
parent
fb35d58977
commit
619fcfb6f6
|
@ -1110,6 +1110,7 @@ Options:
|
|||
|
||||
The DigitalOcean driver will use `ubuntu-14-04-x64` as the default image.
|
||||
|
||||
<<<<<<< HEAD
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|
@ -1121,6 +1122,22 @@ Environment variables and default values:
|
|||
| `--digitalocean-ipv6` | `DIGITALOCEAN_IPV6` | `false` |
|
||||
| `--digitalocean-private-networking` | `DIGITALOCEAN_PRIVATE_NETWORKING` | `false` |
|
||||
| `--digitalocean-backups` | `DIGITALOCEAN_BACKUPS` | `false` |
|
||||
=======
|
||||
#### exoscale
|
||||
Create machines on [exoscale](https://www.exoscale.ch/).
|
||||
|
||||
Get your API key and API secret key from [API details](https://portal.exoscale.ch/account/api) and pass them to `machine create` with the `--exoscale-api-key` and `--exoscale-api-secret-key` options.
|
||||
|
||||
Options:
|
||||
|
||||
- `--exoscale-api-key`: Your API key.
|
||||
- `--exoscale-api-secret-key`: Your API secret key.
|
||||
- `--exoscale-instance-profile`: Instance profile. Default: `small`.
|
||||
- `--exoscale-disk-size`: Disk size for the host in GB. Default: `50`.
|
||||
- `--exoscale-security-group`: Security group. It will be created if it doesn't exist. Default: `docker-machine`.
|
||||
|
||||
If a custom security group is provided, you need to ensure that you allow TCP port 2376 in an ingress rule.
|
||||
>>>>>>> 18cfe58... redhat: updated docs to explain base operating systems
|
||||
|
||||
#### Generic
|
||||
Create machines using an existing VM/Host with SSH.
|
||||
|
@ -1513,6 +1530,7 @@ Options:
|
|||
|
||||
The VMware vSphere driver uses the latest boot2docker image.
|
||||
|
||||
<<<<<<< HEAD
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|
@ -1563,6 +1581,14 @@ Environment variables and default values:
|
|||
| `--exoscale-availability-zone` | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2` |
|
||||
| `--exoscale-keypair` | `EXOSCALE_KEYPAIR` | - |
|
||||
|
||||
## Base Operating Systems
|
||||
The default base operating system for Machine is Boot2Docker on local providers
|
||||
(VirtualBox, Fusion, Hyper-V, etc) and the latest Ubuntu LTS supported
|
||||
by the cloud provider. RedHat Enterprise Linux is also supported. To use
|
||||
RHEL, you will need to select the image accordingly with the provider. For
|
||||
example, in Amazon EC2, you could use "ami-12663b7a" as the
|
||||
`--amazonec2-ami` option which create an instance using RHEL 7.1 64-bit.
|
||||
|
||||
## Release Notes
|
||||
|
||||
### Version 0.2.0 (April 16, 2015)
|
||||
|
|
Loading…
Reference in New Issue