Browse code

Merge pull request #3161 from SvenDowideit/make-replace-docker-binary-note-more-obvious

associate swapping the built docker binary with building the binary, rather than a note in building the docs

Andy Rothfusz authored on 2013/12/12 07:04:34
Showing 1 changed files
... ...
@@ -44,7 +44,8 @@ This following command will build a development environment using the Dockerfile
44 44
 
45 45
     sudo make build
46 46
 
47
-If the build is successful, congratulations! You have produced a clean build of docker, neatly encapsulated in a standard build environment. 
47
+If the build is successful, congratulations! You have produced a clean build of 
48
+docker, neatly encapsulated in a standard build environment. 
48 49
 
49 50
 
50 51
 Step 4: Build the Docker Binary
... ...
@@ -58,6 +59,19 @@ To create the Docker binary, run this command:
58 58
 
59 59
 This will create the Docker binary in ``./bundles/<version>-dev/binary/``
60 60
 
61
+Using your built Docker binary
62
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
63
+
64
+The binary is available outside the container in the directory 
65
+``./bundles/<version>-dev/binary/``. You can swap your host docker executable 
66
+with this binary for live testing - for example, on ubuntu: 
67
+
68
+.. code-block:: bash
69
+
70
+	sudo service docker stop ; sudo cp $(which docker) $(which docker)_ ; sudo cp ./bundles/<version>-dev/binary/docker-<version>-dev $(which docker);sudo service docker start
71
+	
72
+.. note:: Its safer to run the tests below before swapping your hosts docker binary.
73
+
61 74
 
62 75
 Step 5: Run the Tests
63 76
 ---------------------
... ...
@@ -134,9 +148,6 @@ to it, you can build the documentation and then serve it by:
134 134
 	# type Ctrl-C to exit
135 135
 
136 136
 
137
-.. note:: The binary is available outside the container in the directory  ``./bundles/<version>-dev/binary/``. You can swap your host docker executable with this binary for live testing - for example, on ubuntu: ``sudo service docker stop ; sudo cp $(which docker) $(which docker)_ ; sudo cp ./bundles/<version>-dev/binary/docker-<version>-dev $(which docker);sudo service docker start``.
138
-
139
-
140 137
 **Need More Help?**
141 138
 
142 139
 If you need more help then hop on to the `#docker-dev IRC channel <irc://chat.freenode.net#docker-dev>`_ or post a message on the `Docker developer mailinglist <https://groups.google.com/d/forum/docker-dev>`_.