mirror of https://github.com/docker/docs.git
Merge pull request #1314 from moxiegirl/tweak-1288
Tweaking the language to the 1288 work. Thanks everyone.
This commit is contained in:
commit
ee8ec4b7aa
|
@ -50,11 +50,11 @@ architectures are below:
|
|||
- [Linux - x86_64](https://github.com/docker/machine/releases/download/v0.2.0/docker-machine_linux-amd64)
|
||||
- [Linux - i386](https://github.com/docker/machine/releases/download/v0.2.0/docker-machine_linux-386)
|
||||
|
||||
### OSX and Linux
|
||||
### OS X and Linux
|
||||
|
||||
To install on OSX or Linux, download the proper binary to somewhere in your
|
||||
To install on OS X or Linux, download the proper binary to somewhere in your
|
||||
`PATH` (e.g. `/usr/local/bin`) and make it executable. For instance, to install on
|
||||
most OSX machines these commands should suffice:
|
||||
most OS X machines these commands should suffice:
|
||||
|
||||
```
|
||||
$ curl -L https://github.com/docker/machine/releases/download/v0.2.0/docker-machine_darwin-amd64 > /usr/local/bin/docker-machine
|
||||
|
@ -382,7 +382,7 @@ $ docker run swarm create
|
|||
```
|
||||
Once you have the token, you can create the cluster.
|
||||
|
||||
### Swarm Master
|
||||
### Swarm master
|
||||
|
||||
Create the Swarm master:
|
||||
|
||||
|
@ -398,7 +398,7 @@ docker-machine create \
|
|||
Replace `<TOKEN-FROM-ABOVE>` with your random token.
|
||||
This will create the Swarm master and add itself as a Swarm node.
|
||||
|
||||
### Swarm Nodes
|
||||
### Swarm nodes
|
||||
|
||||
Now, create more Swarm nodes:
|
||||
|
||||
|
@ -589,7 +589,7 @@ $ docker-machine create -d virtualbox \
|
|||
gdns
|
||||
```
|
||||
|
||||
##### Specifying Swarm options for the created machine
|
||||
##### Specifying Docker Swarm options for the created machine
|
||||
|
||||
In addition to being able to configure Docker Engine options as listed above,
|
||||
you can use Machine to specify how the created Swarm master should be
|
||||
|
@ -1198,7 +1198,7 @@ Options:
|
|||
- `--generic-ssh-key`: Path to the SSH user private key.
|
||||
- `--generic-ssh-port`: Port to use for SSH.
|
||||
|
||||
> Note: you must use a base Operating System supported by Machine.
|
||||
> **Note**: You must use a base operating system supported by Machine.
|
||||
|
||||
Environment variables and default values:
|
||||
|
||||
|
@ -1603,11 +1603,12 @@ Environment variables and default values:
|
|||
| `--vmwarevsphere-pool` | `VSPHERE_POOL` | - |
|
||||
| `--vmwarevsphere-compute-ip` | `VSPHERE_COMPUTE_IP` | - |
|
||||
|
||||
## Base Operating Systems
|
||||
The Machine provisioning system supports several base operating systems.
|
||||
The default base operating system is Boot2Docker on local providers
|
||||
(VirtualBox, Fusion, Hyper-V, etc) and the latest Ubuntu LTS supported
|
||||
by the cloud provider.
|
||||
## Specify a base operating systems
|
||||
|
||||
The Machine provisioning system supports several base operating systems. For
|
||||
local providers such as VirtualBox, Fusion, Hyper-V, and so forth, the default
|
||||
base operating system is Boot2Docker. For cloud providers, the base operating
|
||||
system is the latest Ubuntu LTS the provider supports.
|
||||
|
||||
| Operating System | Version | Notes |
|
||||
|----------------------------|------------------|-------------------------|
|
||||
|
@ -1619,12 +1620,13 @@ by the cloud provider.
|
|||
| CentOS | 7+ | experimental |
|
||||
| Fedora | 21+ | experimental |
|
||||
|
||||
If you want to use a different base operating system on a remote provider,
|
||||
you will need to select the image accordingly for that provider. For
|
||||
example, on DigitalOcean you would use the `--digitalocean-image` flag.
|
||||
For Amazon AWS, you would use the `--amazonec2-ami` flag.
|
||||
To use a different base operating system on a remote provider, specify the
|
||||
provider's image flag and one of its available images. For example, to
|
||||
select a `debian-8-x64` image on DigitalOcean you would supply the following:
|
||||
|
||||
> Note: if you change the base image for a provider you may also need to change
|
||||
the SSH user as well. For example, the default Red Hat AMI on EC2 expects the
|
||||
SSH user to be ec2-user, so you would have to specify this with
|
||||
--digitalocean-image=debian-8-x64`
|
||||
|
||||
If you change the base image for a provider, you may also need to change
|
||||
the SSH user. For example, the default Red Hat AMI on EC2 expects the
|
||||
SSH user to be `ec2-user`, so you would have to specify this with
|
||||
`--amazonec2-ssh-user ec2-user`.
|
||||
|
|
Loading…
Reference in New Issue