change the policy wrt $ sudo docker to simplify auto-testing

This commit is contained in:
Sven Dowideit 2013-12-06 12:52:32 +10:00 committed by Tibor Vass
parent 01d4e98cc8
commit 3091ba88fa
1 changed files with 8 additions and 7 deletions

View File

@ -51,15 +51,15 @@ directory:
###Alternative Installation: Docker Container ###Alternative Installation: Docker Container
If you're running ``docker`` on your development machine then you may If you're running ``docker`` on your development machine then you may
find it easier and cleaner to use the Dockerfile. This installs Sphinx find it easier and cleaner to use the docs Dockerfile. This installs Sphinx
in a container, adds the local ``docs/`` directory and builds the HTML in a container, adds the local ``docs/`` directory and builds the HTML
docs inside the container, even starting a simple HTTP server on port docs inside the container, even starting a simple HTTP server on port
8000 so that you can connect and see your changes. Just run ``docker 8000 so that you can connect and see your changes.
build .`` and run the resulting image. This is the equivalent to
``make clean server`` since each container starts clean.
In the ``docs/`` directory, run: In the ``docker`` source directory, run:
```docker build -t docker:docs . && docker run -p 8000:8000 docker:docs``` ```make doc```
This is the equivalent to ``make clean server`` since each container starts clean.
Usage Usage
----- -----
@ -128,7 +128,8 @@ Guides on using sphinx
* Code examples * Code examples
* Start without $, so it's easy to copy and paste. * Start typed commands with ``$ `` (dollar space) so that they
are easily differentiated from program output.
* Use "sudo" with docker to ensure that your command is runnable * Use "sudo" with docker to ensure that your command is runnable
even if they haven't [used the *docker* even if they haven't [used the *docker*
group](http://docs.docker.io/en/latest/use/basics/#why-sudo). group](http://docs.docker.io/en/latest/use/basics/#why-sudo).