mirror of https://github.com/docker/docs.git
Added links to @jpetazzo 's kernel article, removed quote indents from puppet.rst
This commit is contained in:
parent
d8e60b797f
commit
c5f15dcd3d
|
@ -27,7 +27,7 @@ But we know people have had success running it under
|
|||
Dependencies:
|
||||
-------------
|
||||
|
||||
* 3.8 Kernel
|
||||
* 3.8 Kernel (read more about :ref:`kernel`)
|
||||
* AUFS filesystem support
|
||||
* lxc
|
||||
* bsdtar
|
||||
|
|
|
@ -16,7 +16,7 @@ Right now, the officially supported distribution are:
|
|||
|
||||
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)
|
||||
|
||||
.. _ubuntu_precise:
|
||||
|
|
|
@ -25,7 +25,7 @@ Installation
|
|||
The module is available on the `Puppet Forge <https://forge.puppetlabs.com/garethr/docker/>`_
|
||||
and can be installed using the built-in module tool.
|
||||
|
||||
.. code-block:: bash
|
||||
.. code-block:: bash
|
||||
|
||||
puppet module install garethr/docker
|
||||
|
||||
|
@ -41,7 +41,7 @@ for managing images and containers.
|
|||
Installation
|
||||
~~~~~~~~~~~~
|
||||
|
||||
.. code-block:: ruby
|
||||
.. code-block:: ruby
|
||||
|
||||
include 'docker'
|
||||
|
||||
|
@ -51,13 +51,13 @@ Images
|
|||
The next step is probably to install a docker image, for this we have a
|
||||
defined type which can be used like so:
|
||||
|
||||
.. code-block:: ruby
|
||||
.. code-block:: ruby
|
||||
|
||||
docker::image { 'base': }
|
||||
|
||||
This is equivalent to running:
|
||||
|
||||
.. code-block:: bash
|
||||
.. code-block:: bash
|
||||
|
||||
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 exec. Note that you can also remove images you no longer need with:
|
||||
|
||||
.. code-block:: ruby
|
||||
.. code-block:: ruby
|
||||
|
||||
docker::image { 'base':
|
||||
ensure => 'absent',
|
||||
|
@ -78,7 +78,7 @@ Containers
|
|||
Now you have an image you can run commands within a container managed by
|
||||
docker.
|
||||
|
||||
.. code-block:: ruby
|
||||
.. code-block:: ruby
|
||||
|
||||
docker::run { 'helloworld':
|
||||
image => 'base',
|
||||
|
@ -87,13 +87,13 @@ docker.
|
|||
|
||||
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"
|
||||
|
||||
Run also contains a number of optional parameters:
|
||||
|
||||
.. code-block:: ruby
|
||||
.. code-block:: ruby
|
||||
|
||||
docker::run { 'helloworld':
|
||||
image => 'base',
|
||||
|
|
Loading…
Reference in New Issue