mirror of https://github.com/docker/docs.git
				
				
				
			Merge pull request #1842 from moxiegirl/carry-1830
Updating with changes dropped in 1830
This commit is contained in:
		
						commit
						7e1e8b6717
					
				|  | @ -19,17 +19,19 @@ inside your own data center. It automatically creates hosts, installs Docker on | ||||||
| them, then configures the `docker` client to talk to them. A "machine" is the | them, then configures the `docker` client to talk to them. A "machine" is the | ||||||
| combination of a Docker host and a configured client. | combination of a Docker host and a configured client. | ||||||
| 
 | 
 | ||||||
| Once you create one or more Docker hosts, Docker Machine supplies a number of commands for | Once you create one or more Docker hosts, Docker Machine supplies a number of | ||||||
| managing them. Using these commands you can | commands for managing them. Using these commands you can | ||||||
| 
 | 
 | ||||||
|  - start, inspect, stop, and restart a host |  - start, inspect, stop, and restart a host | ||||||
|  - upgrade the Docker client and daemon |  - upgrade the Docker client and daemon | ||||||
|  - configure a Docker client to talk to your host |  - configure a Docker client to talk to your host | ||||||
| 
 | 
 | ||||||
| ## Install | ### Looking for the installation docs? | ||||||
| You can install Docker Machine by installing the [Docker Toolbox](https://www.docker.com/toolbox | 
 | ||||||
| ) or to get the binary only, visit the [GitHub Releases](https://github.com/docker/machine/releases) | For Windows or Mac, you can obtain Docker Machine by installing the [Docker | ||||||
| for the latest release. | Toolbox](https://www.docker.com/toolbox ). To read instructions for installing | ||||||
|  | Machine on Linux or for installing Machine alone without Docker Toolbox, see the | ||||||
|  | [Machine installation instructions](install-machine.md). | ||||||
| 
 | 
 | ||||||
| ## Understand Docker Machine basic concepts | ## Understand Docker Machine basic concepts | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -11,24 +11,32 @@ weight=3 | ||||||
| 
 | 
 | ||||||
| # Install Docker Machine | # Install Docker Machine | ||||||
| 
 | 
 | ||||||
| Docker Machine is supported on Windows, OS X, and Linux and is installable as | Docker Machine is supported on Windows, OS X, and Linux operating systems. You | ||||||
| one standalone binary.  The links to the binaries for the various platforms and | can install using one of Docker's automated installation methods or you can | ||||||
| architectures are available at the [Github | download and install via a binary. This page details each of those methods. | ||||||
| Release](https://github.com/docker/machine/releases/) page. |  | ||||||
| 
 |  | ||||||
| 
 | 
 | ||||||
| ## OS X and Windows | ## OS X and Windows | ||||||
| 
 | 
 | ||||||
| Install Machine using the Docker Toolbox using the <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X installation</a> | On OS X and Windows, Machine is installed along with other Docker products when | ||||||
| instruction or <a href="https://docs.docker.com/installation/windows" target="_blank">Windows installation</a> instructions. | you install the Docker Toolbox. For details on installing Docker Toolbox, see | ||||||
|  | the <a href="https://docs.docker.com/installation/mac/" target="_blank">Mac OS X | ||||||
|  | installation</a> instructions or <a | ||||||
|  | href="https://docs.docker.com/installation/windows" target="_blank">Windows | ||||||
|  | installation</a> instructions. | ||||||
|  | 
 | ||||||
|  | If you only want Docker Machine, you can install [the Machine binaries | ||||||
|  | directly](https://github.com/docker/machine/releases/). Alternatively, OS X | ||||||
|  | users have the option to follow the Linux installation instructions. | ||||||
| 
 | 
 | ||||||
| ## On Linux | ## On Linux | ||||||
| 
 | 
 | ||||||
| To install on Linux, do the following: | To install on Linux, do the following: | ||||||
| 
 | 
 | ||||||
| 1. Install <a href="https://docs.docker.com/installation/" target="_blank">Docker version 1.7.1 or greater</a>: | 1. Install <a href="https://docs.docker.com/installation/" | ||||||
|  | target="_blank">Docker version 1.7.1 or greater</a>: | ||||||
| 
 | 
 | ||||||
| 2. Download the Machine binary to somewhere in your `PATH` (for example, `/usr/local/bin`). | 2. Download the Machine binary to somewhere in your `PATH` (for example, | ||||||
|  | `/usr/local/bin`). | ||||||
| 
 | 
 | ||||||
|         $ curl -L https://github.com/docker/machine/releases/download/v0.4.0/docker-machine_linux-amd64 > /usr/local/bin/docker-machine |         $ curl -L https://github.com/docker/machine/releases/download/v0.4.0/docker-machine_linux-amd64 > /usr/local/bin/docker-machine | ||||||
| 
 | 
 | ||||||
|  | @ -41,9 +49,31 @@ To install on Linux, do the following: | ||||||
| 			$ docker-machine -v | 			$ docker-machine -v | ||||||
| 			machine version 0.4.0 | 			machine version 0.4.0 | ||||||
| 
 | 
 | ||||||
|  | ## Install from binary | ||||||
|  | 
 | ||||||
|  | The Docker Machine team compiles binaries for several platforms and | ||||||
|  | architectures and makes them available from [the Machine release page on | ||||||
|  | Github](https://github.com/docker/machine/releases/). To install from a binary: | ||||||
|  | 
 | ||||||
|  | 1. Download the binary you want. | ||||||
|  | 2. Rename the binary to `docker-machine`. | ||||||
|  | 3. Move the `docker-machine` file to an appropriate directory on your system. | ||||||
|  | 
 | ||||||
|  |     For example, on an OS X machine, you might move it to the `/usr/local/bin` | ||||||
|  |     directory. | ||||||
|  | 
 | ||||||
|  | 4. Ensure the file's executable permissions are correct. | ||||||
|  | 5. Apply executable permissions to the binary: | ||||||
|  | 
 | ||||||
|  |         $ chmod +x /usr/local/bin/docker-machine | ||||||
|  | 
 | ||||||
|  | 6. Check the installation by displaying the Machine version: | ||||||
|  | 
 | ||||||
|  |         $ docker-machine -v | ||||||
|  |         machine version 0.4.0 | ||||||
|  | 
 | ||||||
| ## Where to go next | ## Where to go next | ||||||
| 
 | 
 | ||||||
| * [Docker Machine overview](/) | * [Docker Machine overview](/) | ||||||
| * [Docker Machine driver reference](/drivers) | * [Docker Machine driver reference](/drivers) | ||||||
| * [Docker Machine subcommand reference](/reference) | * [Docker Machine subcommand reference](/reference) | ||||||
| 
 |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue