Browse code

Several reader issues fixed

- Fix boot2docker url
- move HomeBrew instructions to a separate section
- fix docker client 5-liner to work (its still ugly)
- fix and update program output

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)

Sven Dowideit authored on 2014/05/05 21:52:12
Showing 1 changed files
... ...
@@ -28,22 +28,14 @@ Once the download is complete, open the disk image, run the set up file
28 28
 (i.e. `VirtualBox.pkg`) and install VirtualBox. Do
29 29
 not simply copy the package without running the installer.
30 30
 
31
-### boot2docker
31
+### Manual Installation
32
+#### boot2docker
32 33
 
33 34
 [boot2docker](https://github.com/boot2docker/boot2docker) provides a
34
-handy script to easily manage the VM running the `docker`
35
+handy script to manage the VM running the `docker`
35 36
 daemon. It also takes care of the installation for the OS
36 37
 image that is used for the job.
37 38
 
38
-#### With Homebrew
39
-
40
-If you are using Homebrew on your machine, simply run the following
41
-command to install `boot2docker`:
42
-
43
-    $ brew install boot2docker
44
-
45
-#### Manual installation
46
-
47 39
 Open up a new terminal window, if you have not already.
48 40
 
49 41
 Run the following commands to get boot2docker:
... ...
@@ -52,33 +44,23 @@ Run the following commands to get boot2docker:
52 52
     $ cd ~/bin
53 53
 
54 54
     # Get the file
55
-    $ curl https://raw.github.com/boot2docker/boot2docker/master/boot2docker > boot2docker
55
+    $ curl https://raw.githubusercontent.com/boot2docker/boot2docker/master/boot2docker > boot2docker
56 56
 
57 57
     # Mark it executable
58 58
     $ chmod +x boot2docker
59 59
 
60
-### Docker OS X Client
61
-
62
-The `docker` daemon is accessed using the
63
-`docker` client.
64
-
65
-#### With Homebrew
66
-
67
-Run the following command to install the `docker`
68
-client:
69
-
70
-    $ brew install docker
60
+#### Docker OS X Client
71 61
 
72
-#### Manual installation
62
+The `docker` daemon is accessed using the `docker` client.
73 63
 
74 64
 Run the following commands to get it downloaded and set up:
75 65
 
76 66
     # Get the docker client file
77 67
     $ DIR=$(mktemp -d ${TMPDIR:-/tmp}/dockerdl.XXXXXXX) && \
78
-    $ curl -f -o $DIR/ld.tgz https://get.docker.io/builds/Darwin/x86_64/docker-latest.tgz && \
79
-    $ gunzip $DIR/ld.tgz && \
80
-    $ tar xvf $DIR/ld.tar -C $DIR/ && \
81
-    $ cp $DIR/usr/local/bin/docker ./docker
68
+      curl -f -o $DIR/ld.tgz https://get.docker.io/builds/Darwin/x86_64/docker-latest.tgz && \
69
+      gunzip $DIR/ld.tgz && \
70
+      tar xvf $DIR/ld.tar -C $DIR/ && \
71
+      cp $DIR/usr/local/bin/docker ./docker
82 72
 
83 73
     # Set the environment variable for the docker daemon
84 74
     $ export DOCKER_HOST=tcp://127.0.0.1:4243
... ...
@@ -87,6 +69,18 @@ Run the following commands to get it downloaded and set up:
87 87
     $ sudo mkdir -p /usr/local/bin
88 88
     $ sudo cp docker /usr/local/bin/
89 89
 
90
+### (OR) With Homebrew
91
+
92
+If you are using Homebrew on your machine, simply run the following
93
+command to install `boot2docker`:
94
+
95
+    $ brew install boot2docker
96
+
97
+Run the following command to install the `docker`
98
+client:
99
+
100
+    $ brew install docker
101
+
90 102
 And that's it! Let's check out how to use it.
91 103
 
92 104
 ## How To Use Docker On Mac OS X
... ...
@@ -104,8 +98,7 @@ commands:
104 104
 
105 105
     # To see all available commands:
106 106
     $ ./boot2docker
107
-
108
-    # Usage ./boot2docker {init|start|up|pause|stop|restart|status|info|delete|ssh|download}
107
+    Usage ./boot2docker {init|start|up|pause|stop|restart|status|info|delete|ssh|download}
109 108
 
110 109
 ### The `docker` client
111 110
 
... ...
@@ -114,12 +107,12 @@ use the `docker` client just like any other
114 114
 application.
115 115
 
116 116
     $ docker version
117
-    # Client version: 0.7.6
118
-    # Go version (client): go1.2
119
-    # Git commit (client): bc3b2ec
120
-    # Server version: 0.7.5
121
-    # Git commit (server): c348c04
122
-    # Go version (server): go1.2
117
+    Client version: 0.10.0
118
+    Client API version: 1.10
119
+    Server version: 0.10.0
120
+    Server API version: 1.10
121
+    Last stable version: 0.10.0
122
+
123 123
 
124 124
 ### Forwarding VM Port Range to Host
125 125