From f8535f139785c98d6582db1b95846549356e6461 Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Fri, 11 Sep 2015 15:47:22 -0700 Subject: [PATCH] Updating with changes dropped in 1830 Tweaking language Incorporate Olivier's comments Stomp the nit --- a misspelling Wrapping lines Possessive Signed-off-by: Mary Anthony --- docs/index.md | 14 +++++++----- docs/install-machine.md | 50 ++++++++++++++++++++++++++++++++--------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/docs/index.md b/docs/index.md index 1bfee91327..b64bcf8d9a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -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 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 -managing them. Using these commands you can +Once you create one or more Docker hosts, Docker Machine supplies a number of +commands for managing them. Using these commands you can - start, inspect, stop, and restart a host - upgrade the Docker client and daemon - configure a Docker client to talk to your host -## Install -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 the latest release. +### Looking for the installation docs? + +For Windows or Mac, you can obtain Docker Machine by installing the [Docker +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 diff --git a/docs/install-machine.md b/docs/install-machine.md index 772dcf9b2e..f3570df544 100644 --- a/docs/install-machine.md +++ b/docs/install-machine.md @@ -11,24 +11,32 @@ weight=3 # Install Docker Machine -Docker Machine is supported on Windows, OS X, and Linux and is installable as -one standalone binary. The links to the binaries for the various platforms and -architectures are available at the [Github -Release](https://github.com/docker/machine/releases/) page. - +Docker Machine is supported on Windows, OS X, and Linux operating systems. You +can install using one of Docker's automated installation methods or you can +download and install via a binary. This page details each of those methods. ## OS X and Windows -Install Machine using the Docker Toolbox using the Mac OS X installation -instruction or Windows installation instructions. +On OS X and Windows, Machine is installed along with other Docker products when +you install the Docker Toolbox. For details on installing Docker Toolbox, see +the Mac OS X +installation instructions or Windows +installation 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 To install on Linux, do the following: -1. Install Docker version 1.7.1 or greater: +1. Install Docker version 1.7.1 or greater: -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 @@ -41,9 +49,31 @@ To install on Linux, do the following: $ docker-machine -v 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 * [Docker Machine overview](/) * [Docker Machine driver reference](/drivers) * [Docker Machine subcommand reference](/reference) -