Skip to content

Commit

Permalink
Merge pull request moby#3161 from SvenDowideit/make-replace-docker-bi…
Browse files Browse the repository at this point in the history
…nary-note-more-obvious

associate swapping the built docker binary with building the binary, rather than a note in building the docs
  • Loading branch information
metaliveblog committed Dec 11, 2013
2 parents 11b3fbb + be13735 commit 6cf8ec6
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions docs/sources/contributing/devenvironment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -58,6 +59,19 @@ To create the Docker binary, run this command:
This will create the Docker binary in ``./bundles/<version>-dev/binary/``

Using your built Docker binary
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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:

.. code-block:: bash
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
.. note:: Its safer to run the tests below before swapping your hosts docker binary.


Step 5: Run the Tests
---------------------
Expand Down Expand Up @@ -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/<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``.


**Need More Help?**

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>`_.

0 comments on commit 6cf8ec6

Please sign in to comment.