mirror of https://github.com/docker/docs.git
Fixed corrupted docs
Signed-off-by: Jan Broer <janeczku@yahoo.de>
This commit is contained in:
Jan Broer
parent
ae5aeb2a67
commit
8cdf8e9561
|
|
@ -1144,8 +1144,6 @@ Options:
|
|||
|
||||
The DigitalOcean driver will use `ubuntu-14-04-x64` as the default image.
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|
|
@ -1157,7 +1155,7 @@ 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/).
|
||||
|
||||
|
|
@ -1165,13 +1163,31 @@ Get your API key and API secret key from [API details](https://portal.exoscale.c
|
|||
|
||||
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`.
|
||||
- `--exoscale-url`: **required** Your API endpoint.
|
||||
- `--exoscale-api-key`: **required** Your API key.
|
||||
- `--exoscale-api-secret-key`: **required** Your API secret key.
|
||||
- `--exoscale-instance-profile`: Instance profile.
|
||||
- `--exoscale-disk-size`: Disk size for the host in GB.
|
||||
- `--exoscale-image`: exoscale disk size. (10, 50, 100, 200, 400)
|
||||
- `--exoscale-security-group`: Security group. It will be created if it doesn't exist.
|
||||
- `--exoscale-availability-zone`: exoscale availability zone.
|
||||
- `--exoscale-keypair`: exoscale keypair name.
|
||||
|
||||
If a custom security group is provided, you need to ensure that you allow TCP port 2376 in an ingress rule.
|
||||
If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule.
|
||||
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|---------------------------------|------------------------------|------------------|
|
||||
| **`--exoscale-url`** | `EXOSCALE_ENDPOINT` | - |
|
||||
| **`--exoscale-api-key`** | `EXOSCALE_API_KEY` | - |
|
||||
| **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET` | - |
|
||||
| `--exoscale-instance-profile` | `EXOSCALE_INSTANCE_PROFILE` | `small` |
|
||||
| `--exoscale-disk-size` | `EXOSCALE_DISK_SIZE` | `50` |
|
||||
| `--exoscale-image` | `EXSOCALE_IMAGE` | `ubuntu-14.04` |
|
||||
| `--exoscale-security-group` | `EXOSCALE_SECURITY_GROUP` | `docker-machine` |
|
||||
| `--exoscale-availability-zone` | `EXOSCALE_AVAILABILITY_ZONE` | `ch-gva-2` |
|
||||
| `--exoscale-keypair` | `EXOSCALE_KEYPAIR` | - |
|
||||
|
||||
#### Generic
|
||||
Create machines using an existing VM/Host with SSH.
|
||||
|
|
@ -1564,8 +1580,6 @@ Options:
|
|||
|
||||
The VMware vSphere driver uses the latest boot2docker image.
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|
|
@ -1583,41 +1597,6 @@ Environment variables and default values:
|
|||
| `--vmwarevsphere-pool` | `VSPHERE_POOL` | - |
|
||||
| `--vmwarevsphere-compute-ip` | `VSPHERE_COMPUTE_IP` | - |
|
||||
|
||||
#### 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-url`: **required** Your API endpoint.
|
||||
- `--exoscale-api-key`: **required** Your API key.
|
||||
- `--exoscale-api-secret-key`: **required** Your API secret key.
|
||||
- `--exoscale-instance-profile`: Instance profile.
|
||||
- `--exoscale-disk-size`: Disk size for the host in GB.
|
||||
- `--exoscale-image`: exoscale disk size. (10, 50, 100, 200, 400)
|
||||
- `--exoscale-security-group`: Security group. It will be created if it doesn't exist.
|
||||
- `--exoscale-availability-zone`: exoscale availability zone.
|
||||
- `--exoscale-keypair`: exoscale keypair name.
|
||||
|
||||
If a custom security group is provided, you need to ensure that you allow TCP ports 22 and 2376 in an ingress rule.
|
||||
|
||||
Environment variables and default values:
|
||||
|
||||
| CLI option | Environment variable | Default |
|
||||
|---------------------------------|------------------------------|------------------|
|
||||
| **`--exoscale-url`** | `EXOSCALE_ENDPOINT` | - |
|
||||
| **`--exoscale-api-key`** | `EXOSCALE_API_KEY` | - |
|
||||
| **`--exoscale-api-secret-key`** | `EXOSCALE_API_SECRET` | - |
|
||||
| `--exoscale-instance-profile` | `EXOSCALE_INSTANCE_PROFILE` | `small` |
|
||||
| `--exoscale-disk-size` | `EXOSCALE_DISK_SIZE` | `50` |
|
||||
| `--exoscale-image` | `EXSOCALE_IMAGE` | `ubuntu-14.04` |
|
||||
| `--exoscale-security-group` | `EXOSCALE_SECURITY_GROUP` | `docker-machine` |
|
||||
| `--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
|
||||
|
|
|
|||
Loading…
Reference in New Issue