1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/docs
Galen Sampson ccbb5d3492 Vagrantfile updates.
- Remove the overrides config.vm.box and config.vm.box_url and use
  the same values for all providers.
- Use the same private key path for all providers.  It is still possible
  to set a different private key path through the environment variable
  SSH_PRIVKEY_PATH if desired (your AWS key may be different from your
  Virtualbox key).
- Allow the environment variable AWS_INSTANCE_TYPE to specify the
  instance type of instead of hard coding the AWS instance type as
  't1.micro'.  't1.micro' is still the default if unspecified.
- Use the same environment variables for keys as the Amazon provided EC2
  API tools.  This allows people who already have the EC2 tools set up
  correctly to use 'vagrant up' with less environment configuration
  than before.
- Rewrite the provisioning code.  The goal is to be idempotent and to
  correctly install docker for all providers instead of just virtualbox.
  It will conditionally install the virtualbox guest additions if
  virtualbox is the provider.
- Update the AWS install documentation to reflect the changes.
2013-11-10 23:39:26 -08:00
..
sources Vagrantfile updates. 2013-11-10 23:39:26 -08:00
theme Fix github link in docs 2013-10-21 22:58:56 +02:00
Dockerfile add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability 2013-10-29 12:58:58 +10:00
MAINTAINERS Add GitHub usernames to MAINTAINERS 2013-08-09 21:16:44 -04:00
Makefile Add list of Docker Remote API Client Libraries. Fixes #800. 2013-06-10 15:17:27 -07:00
README.md add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability 2013-10-29 12:58:58 +10:00
requirements.txt added new sphinx contrib extention for better REST API docs, and changed the index search API so that it uses the new docs, as a test to make sure it works correctly 2013-05-06 13:38:51 -04:00

Docker Documentation

Overview

The source for Docker documentation is here under sources/ in the form of .rst files. These files use reStructuredText formatting with Sphinx extensions for structure, cross-linking and indexing.

The HTML files are built and hosted on readthedocs.org, appearing via proxy on https://docs.docker.io. The HTML files update automatically after each change to the master or release branch of the docker files on GitHub thanks to post-commit hooks. The "release" branch maps to the "latest" documentation and the "master" branch maps to the "master" documentation.

Warning: The "master" documentation may include features not yet part of any official docker release. "Master" docs should be used only for understanding bleeding-edge development and "latest" should be used for the latest official release.

If you need to manually trigger a build of an existing branch, then you can do that through the readthedocs interface. If you would like to add new build targets, including new branches or tags, then you must contact one of the existing maintainers and get your readthedocs.org account added to the maintainers list, or just file an issue on GitHub describing the branch/tag and why it needs to be added to the docs, and one of the maintainers will add it for you.

Getting Started

To edit and test the docs, you'll need to install the Sphinx tool and its dependencies. There are two main ways to install this tool:

###Native Installation

  • Install sphinx: pip install sphinx
    • Mac OS X: [sudo] pip-2.7 install sphinx
  • Install sphinx httpdomain contrib package: pip install sphinxcontrib-httpdomain
    • Mac OS X: [sudo] pip-2.7 install sphinxcontrib-httpdomain
  • If pip is not available you can probably install it using your favorite package manager as python-pip

###Alternative Installation: Docker Container

If you're running docker on your development machine then you may find it easier and cleaner to use the Dockerfile. This installs Sphinx in a container, adds the local docs/ directory and builds the HTML 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 build . and run the resulting image. This is the equivalent to make clean server since each container starts clean.

In the docs/ directory, run: docker build -t docker:docs . && docker run -p 8000:8000 docker:docs

Usage

  • Follow the contribution guidelines (../CONTRIBUTING.md)
  • Work in your own fork of the code, we accept pull requests.
  • Change the .rst files with your favorite editor -- try to keep the lines short and respect RST and Sphinx conventions.
  • Run make clean docs to clean up old files and generate new ones, or just make docs to update after small changes.
  • Your static website can now be found in the _build directory.
  • To preview what you have generated run make server and open http://localhost:8000/ in your favorite browser.

make clean docs must complete without any warnings or errors.

Working using GitHub's file editor

Alternatively, for small changes and typos you might want to use GitHub's built in file editor. It allows you to preview your changes right online (though there can be some differences between GitHub markdown and Sphinx RST). Just be careful not to create many commits.

Images

When you need to add images, try to make them as small as possible (e.g. as gif). Usually images should go in the same directory as the .rst file which references them, or in a subdirectory if one already exists.

Notes

  • For the template the css is compiled from less. When changes are needed they can be compiled using lessc lessc main.less or watched using watch-lessc watch-lessc -i main.less -o main.css

Guides on using sphinx

  • To make links to certain sections create a link target like so:

      .. _hello_world:
    
      Hello world
      ===========
    
      This is.. (etc.)
    

    The _hello_world: will make it possible to link to this position (page and section heading) from all other pages. See the Sphinx docs for more information and examples.

  • Notes, warnings and alarms

      # a note (use when something is important)
      .. note::
    
      # a warning (orange)
      .. warning::
    
      # danger (red, use sparsely)
      .. danger::
    
    
  • Code examples

    • Start without $, so it's easy to copy and paste.
    • Use "sudo" with docker to ensure that your command is runnable even if they haven't used the docker group.

Manpages

  • To make the manpages, run make man. Please note there is a bug in spinx 1.1.3 which makes this fail. Upgrade to the latest version of Sphinx.
  • Then preview the manpage by running man _build/man/docker.1, where _build/man/docker.1 is the path to the generated manfile