docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #709 from dhrp/links-to-kernel-doc 

Added links to @jpetazzo 's kernel article, cleaned puppet doc layout
This commit is contained in:
Andy Rothfusz 2013-05-28 12:07:46 -07:00
parent 3d8da80611 c5f15dcd3d
commit 235ae9cd43
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/installation/binaries.rst
View File

@ -27,7 +27,7 @@ But we know people have had success running it under
Dependencies: Dependencies:
------------- -------------
* 3.8 Kernel * 3.8 Kernel (read more about :ref:`kernel`)
* AUFS filesystem support * AUFS filesystem support
* lxc * lxc
* bsdtar * bsdtar

2
docs/sources/installation/ubuntulinux.rst
View File

@ -16,7 +16,7 @@ Right now, the officially supported distribution are:
Docker has the following dependencies Docker has the following dependencies
* Linux kernel 3.8 * Linux kernel 3.8 (read more about :ref:`kernel`)
* AUFS file system support (we are working on BTRFS support as an alternative) * AUFS file system support (we are working on BTRFS support as an alternative)
.. _ubuntu_precise: .. _ubuntu_precise:

16
docs/sources/use/puppet.rst
View File

@ -25,7 +25,7 @@ Installation
The module is available on the `Puppet Forge <https://forge.puppetlabs.com/garethr/docker/>`_ The module is available on the `Puppet Forge <https://forge.puppetlabs.com/garethr/docker/>`_
and can be installed using the built-in module tool. and can be installed using the built-in module tool.
.. code-block:: bash .. code-block:: bash
puppet module install garethr/docker puppet module install garethr/docker
@ -41,7 +41,7 @@ for managing images and containers.
Installation Installation
~~~~~~~~~~~~ ~~~~~~~~~~~~
.. code-block:: ruby .. code-block:: ruby
include 'docker' include 'docker'
@ -51,13 +51,13 @@ Images
The next step is probably to install a docker image, for this we have a The next step is probably to install a docker image, for this we have a
defined type which can be used like so: defined type which can be used like so:
.. code-block:: ruby .. code-block:: ruby
docker::image { 'base': } docker::image { 'base': }
This is equivalent to running: This is equivalent to running:
.. code-block:: bash .. code-block:: bash
docker pull base docker pull base
@ -66,7 +66,7 @@ This is downloading a large binary so on first run can take a while.
For that reason this define turns off the default 5 minute timeout For that reason this define turns off the default 5 minute timeout
for exec. Note that you can also remove images you no longer need with: for exec. Note that you can also remove images you no longer need with:
.. code-block:: ruby .. code-block:: ruby
docker::image { 'base': docker::image { 'base':
ensure => 'absent', ensure => 'absent',
@ -78,7 +78,7 @@ Containers
Now you have an image you can run commands within a container managed by Now you have an image you can run commands within a container managed by
docker. docker.
.. code-block:: ruby .. code-block:: ruby
docker::run { 'helloworld': docker::run { 'helloworld':
image => 'base', image => 'base',
@ -87,13 +87,13 @@ docker.
This is equivalent to running the following command, but under upstart: This is equivalent to running the following command, but under upstart:
.. code-block:: bash .. code-block:: bash
docker run -d base /bin/sh -c "while true; do echo hello world; sleep 1; done" docker run -d base /bin/sh -c "while true; do echo hello world; sleep 1; done"
Run also contains a number of optional parameters: Run also contains a number of optional parameters:
.. code-block:: ruby .. code-block:: ruby
docker::run { 'helloworld': docker::run { 'helloworld':
image => 'base', image => 'base',