From be137350018608bf4a1fd01ce956f166c39988c4 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 11 Dec 2013 11:12:11 +1000 Subject: [PATCH] associate swapping the built docker binary with building the binary, rather than a note in building the docs --- docs/sources/contributing/devenvironment.rst | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/sources/contributing/devenvironment.rst b/docs/sources/contributing/devenvironment.rst index c152ff9ce5..d9649c6178 100644 --- a/docs/sources/contributing/devenvironment.rst +++ b/docs/sources/contributing/devenvironment.rst @@ -44,7 +44,8 @@ This following command will build a development environment using the Dockerfile sudo make build -If the build is successful, congratulations! You have produced a clean build of docker, neatly encapsulated in a standard build environment. +If the build is successful, congratulations! You have produced a clean build of +docker, neatly encapsulated in a standard build environment. Step 4: Build the Docker Binary @@ -58,6 +59,19 @@ To create the Docker binary, run this command: This will create the Docker binary in ``./bundles/-dev/binary/`` +Using your built Docker binary +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The binary is available outside the container in the directory +``./bundles/-dev/binary/``. You can swap your host docker executable +with this binary for live testing - for example, on ubuntu: + +.. code-block:: bash + + sudo service docker stop ; sudo cp $(which docker) $(which docker)_ ; sudo cp ./bundles/-dev/binary/docker--dev $(which docker);sudo service docker start + +.. note:: Its safer to run the tests below before swapping your hosts docker binary. + Step 5: Run the Tests --------------------- @@ -134,9 +148,6 @@ to it, you can build the documentation and then serve it by: # type Ctrl-C to exit -.. note:: The binary is available outside the container in the directory ``./bundles/-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/-dev/binary/docker--dev $(which docker);sudo service docker start``. - - **Need More Help?** If you need more help then hop on to the `#docker-dev IRC channel `_ or post a message on the `Docker developer mailinglist `_.