Browse code

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredfl)

Fred Lifton authored on 2014/06/09 09:35:49
Showing 1 changed files
... ...
@@ -7,13 +7,13 @@ page_keywords: Docker, Docker documentation, requirements, boot2docker, VirtualB
7 7
 > **Note:**
8 8
 > Docker is supported on Mac OS X 10.6 "Snow Leopard" or newer.
9 9
 
10
-The Docker Engine uses Linux-specific kernel features, so we run it on OS X
11
-using a lightweight virtual machine.  You can use the OS X Docker client to
12
-control the virtualized engine to build, run and manage Docker containers.
10
+The Docker Engine uses Linux-specific kernel features, so to run it on OS X
11
+we need to use a lightweight virtual machine (vm).  You use the OS X Docker client to
12
+control the virtualized Docker Engine to build, run, and manage Docker containers.
13 13
 
14
-To make this process easier we designed a helper application called
15
-[Boot2Docker](https://github.com/boot2docker/boot2docker) to install the
16
-virtual machine and run the Docker daemon.
14
+To make this process easier, we've designed a helper application called
15
+[Boot2Docker](https://github.com/boot2docker/boot2docker) that installs the
16
+virtual machine and runs the Docker daemon.
17 17
 
18 18
 ## Demonstration
19 19
 
... ...
@@ -31,7 +31,7 @@ virtual machine and run the Docker daemon.
31 31
 3. Run the `Boot2Docker` app in the `Applications` folder:
32 32
    ![](/installation/images/osx-Boot2Docker-Start-app.png)
33 33
 
34
-   Or to initiate Boot2Docker manually, open a terminal and run:
34
+   Or, to initiate Boot2Docker manually, open a terminal and run:
35 35
 
36 36
 	     $ boot2docker init
37 37
 	     $ boot2docker start
... ...
@@ -41,8 +41,8 @@ virtual machine and run the Docker daemon.
41 41
    (but least secure) is to just hit [Enter]. This passphrase is used by the
42 42
    `boot2docker ssh` command.
43 43
 
44
-Once you have an initialized virtual machine, you can `boot2docker stop`
45
-and `boot2docker start` it.
44
+Once you have an initialized virtual machine, you can control it with `boot2docker stop`
45
+and `boot2docker start`.
46 46
 
47 47
 ## Upgrading
48 48
 
... ...
@@ -60,36 +60,32 @@ and `boot2docker start` it.
60 60
 
61 61
 ## Running Docker
62 62
 
63
-From your terminal, you can try the “hello world” example. Run:
63
+From your terminal, you can test that Docker is running with a “hello world” example.
64
+Start the vm and then run:
64 65
 
65 66
     $ docker run ubuntu echo hello world
66 67
 
67
-This will download the `ubuntu` image and print `hello world`.
68
+This should download the `ubuntu` image and print `hello world`.
68 69
 
69 70
 ## Container port redirection
70 71
 
71
-The latest version of `boot2docker` sets up two network adapters: one using NAT
72
-to allow the VM to download images and files from the Internet, and one host only
73
-network adapter to which the container's ports will be exposed on.
72
+The latest version of `boot2docker` sets up a host only network adaptor which provides
73
+access to the container's ports.
74 74
 
75
-If you run a container with an exposed port:
75
+If you run a container with an exposed port,
76 76
 
77 77
     $ docker run --rm -i -t -p 80:80 apache
78 78
 
79
-Then you should be able to access that Apache server using the IP address reported
80
-to you using:
79
+then you should be able to access that Apache server using the IP address reported by:
81 80
 
82 81
     $ boot2docker ssh ip addr show dev eth1
83 82
 
84
-Typically, it is 192.168.59.103, but at this point it can change.
85
-
86
-If you want to share container ports with other computers on your LAN, you will
87
-need to set up [NAT adaptor based port forwarding](
88
-https://github.com/boot2docker/boot2docker/blob/master/doc/WORKAROUNDS.md)
83
+Typically, it is 192.168.59.103, but it could get changed by Virtualbox's DHCP
84
+implementation.
89 85
 
90 86
 # Further details
91 87
 
92
-The Boot2Docker management tool provides some commands:
88
+The Boot2Docker management tool provides several commands:
93 89
 
94 90
     $ ./boot2docker
95 91
     Usage: ./boot2docker [<options>]
... ...
@@ -97,4 +93,4 @@ The Boot2Docker management tool provides some commands:
97 97
 
98 98
 Continue with the [User Guide](/userguide/).
99 99
 
100
-For further information or to report issues, please see the [Boot2Docker site](http://boot2docker.io).
100
+For further information or to report issues, please visit the [Boot2Docker site](http://boot2docker.io).