summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Huslage <huslage@gmail.com>2014-05-06 10:31:01 -0400
committerAaron Huslage <huslage@gmail.com>2014-05-06 10:33:41 -0400
commitc6f63e719883812a92a544e5f378e438dd81bca7 (patch)
treeed9897ef25b7624c298df158ff22c7aa18c8eba4
parent839b06b121800a9b222fe673ab54cdad918ba883 (diff)
downloaddocker-b2d-install-rewrite.tar.gz
Split MacOS install docsb2d-install-rewrite
Splitting MacOS install docs into two pieces. The "blessed" installer method and other methods. Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
-rwxr-xr-xdocs/mkdocs.yml1
-rw-r--r--docs/sources/installation/mac.md77
-rw-r--r--docs/sources/installation/mac_other.md77
3 files changed, 89 insertions, 66 deletions
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index c16436e892..966e27262d 100755
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -49,6 +49,7 @@ pages:
- ['installation/cruxlinux.md', 'Installation', 'CRUX Linux']
- ['installation/windows.md', 'Installation', 'Microsoft Windows']
- ['installation/binaries.md', 'Installation', 'Binaries']
+- ['installation/mac_other.md', '**HIDDEN**']
# Examples:
- ['use/index.md', '**HIDDEN**']
diff --git a/docs/sources/installation/mac.md b/docs/sources/installation/mac.md
index c30e0b6440..23a683cc02 100644
--- a/docs/sources/installation/mac.md
+++ b/docs/sources/installation/mac.md
@@ -21,84 +21,29 @@ Instead we run the Docker daemon inside a lightweight virtual machine on your lo
OS X host. We can then use a native client `docker` binary to communicate
with the Docker daemon inside our virtual machine. To make this process
easier we've designed a helper application called
-[boot2docker](https://github.com/boot2docker/boot2docker) to install
+[boot2docker](http://boot2docker.io) to install
that virtual machine and run our Docker daemon.
-[boot2docker](https://github.com/boot2docker/boot2docker) uses
+[boot2docker](http://boot2docker.io) uses
VirtualBox to create the virtual machine so we'll need to install that
first.
-## Installing VirtualBox
-
-Docker on OS X needs VirtualBox to run. To begin with, head over to
-[VirtualBox Download Page](https://www.virtualbox.org/wiki/Downloads)
-and get the tool for `OS X hosts x86/amd64`.
-
-Once the download is complete, open the disk image, run `VirtualBox.pkg`
-and install VirtualBox.
-
-> **Note**:
-> Do not simply copy the package without running the
-> installer.
-
## Installing boot2docker
-### Installing manually
-
-[boot2docker](https://github.com/boot2docker/boot2docker) provides a
-handy script to manage the VM running the Docker daemon. It also takes
-care of the installation of that VM.
-
-Open up a new terminal window and run the following commands to get
-boot2docker:
-
- # Enter the installation directory
- $ mkdir -p ~/bin
- $ cd ~/bin
-
- # Get the file
- $ curl https://raw.githubusercontent.com/boot2docker/boot2docker/master/boot2docker > boot2docker
-
- # Mark it executable
- $ chmod +x boot2docker
-
-### Installing the Docker OS X Client
-
-The Docker daemon is accessed using the `docker` binary.
-
-Run the following commands to get it downloaded and set up:
-
- # Get the docker binary
- $ DIR=$(mktemp -d ${TMPDIR:-/tmp}/dockerdl.XXXXXXX) && \
- curl -f -o $DIR/ld.tgz https://get.docker.io/builds/Darwin/x86_64/docker-latest.tgz && \
- gunzip $DIR/ld.tgz && \
- tar xvf $DIR/ld.tar -C $DIR/ && \
- cp $DIR/usr/local/bin/docker ./docker
-
- # Copy the executable file
- $ sudo mkdir -p /usr/local/bin
- $ sudo cp docker /usr/local/bin/
-
-### Configure the Docker OS X Client
-
-The Docker client, `docker`, uses an environment variable `DOCKER_HOST`
-to specify the location of the Docker daemon to connect to. Specify your
-local boot2docker virtual machine as the value of that variable.
-
- $ export DOCKER_HOST=tcp://127.0.0.1:4243
-
-## Installing boot2docker with Homebrew
+### Installing with the installer
-If you are using Homebrew on your machine, simply run the following
-command to install `boot2docker`:
+<iframe width="560" height="315" src="//www.youtube.com/embed/-kkQzKD5mQc" frameborder="0" allowfullscreen></iframe>
- $ brew install boot2docker
+We provide a packaged installation that includes all of the components you need to run Docker on OS X.
+To begin, head over to [OS X Installer Releases](https://github.com/boot2docker/osx-installer/releases) and
+download the latest release.
-Run the following command to install the Docker client:
+Open the downloaded image, and double-click the installer icon. Follow the prompts and boot2docker will finish
+installing.
- $ brew install docker
+There are some [other install methods](../mac_other/) if you prefer to do things manually or use homebrew.
-And that's it! Let's check out how to use it.
+That's it. Now let's learn how to use it.
# How To Use Docker On Mac OS X
diff --git a/docs/sources/installation/mac_other.md b/docs/sources/installation/mac_other.md
new file mode 100644
index 0000000000..60938c9836
--- /dev/null
+++ b/docs/sources/installation/mac_other.md
@@ -0,0 +1,77 @@
+page_title: Other ways to install Docker on Mac OS X
+page_description: Instructions for other methods of installing Docker on OS X using boot2docker.
+page_keywords: Docker, Docker documentation, requirements, boot2docker, VirtualBox, SSH, Linux, OSX, OS X, Mac
+
+# Other ways to install Docker on Mac OS X
+
+## Installing manually
+
+### Installing VirtualBox
+
+Docker on OS X needs VirtualBox to run. To begin with, head over to
+[VirtualBox Download Page](https://www.virtualbox.org/wiki/Downloads)
+and get the tool for `OS X hosts x86/amd64`.
+
+Once the download is complete, open the disk image, run `VirtualBox.pkg`
+and install VirtualBox.
+
+### Installing boot2docker
+
+> **Note**:
+> Do not simply copy the package without running the
+> installer.
+
+[boot2docker](http://boot2docker.io) provides a
+handy script to manage the VM running the Docker daemon. It also takes
+care of the installation of that VM.
+
+Open up a new terminal window and run the following commands to get
+boot2docker:
+
+ # Enter the installation directory
+ $ mkdir -p ~/bin
+ $ cd ~/bin
+
+ # Get the file
+ $ curl https://raw.githubusercontent.com/boot2docker/boot2docker/master/boot2docker > boot2docker
+
+ # Mark it executable
+ $ chmod +x boot2docker
+
+### Installing the Docker OS X Client
+
+The Docker daemon is accessed using the `docker` binary.
+
+Run the following commands to get it downloaded and set up:
+
+ # Get the docker binary
+ $ DIR=$(mktemp -d ${TMPDIR:-/tmp}/dockerdl.XXXXXXX) && \
+ curl -f -o $DIR/ld.tgz https://get.docker.io/builds/Darwin/x86_64/docker-latest.tgz && \
+ gunzip $DIR/ld.tgz && \
+ tar xvf $DIR/ld.tar -C $DIR/ && \
+ cp $DIR/usr/local/bin/docker ./docker
+
+ # Copy the executable file
+ $ sudo mkdir -p /usr/local/bin
+ $ sudo cp docker /usr/local/bin/
+
+### Configure the Docker OS X Client
+
+The Docker client, `docker`, uses an environment variable `DOCKER_HOST`
+to specify the location of the Docker daemon to connect to. Specify your
+local boot2docker virtual machine as the value of that variable.
+
+ $ export DOCKER_HOST=tcp://127.0.0.1:4243
+
+## Installing boot2docker with Homebrew
+
+If you are using Homebrew on your machine, simply run the following
+command to install `boot2docker`:
+
+ $ brew install boot2docker
+
+Run the following command to install the Docker client:
+
+ $ brew install docker
+
+And that's it! [Let's check out how to use it.](/installation/mac/#how-to-use-docker-on-mac-os-x) \ No newline at end of file