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

Clean up grammar on puppet.rst

This commit is contained in:
mattymo 2014-01-27 15:13:17 +03:00
parent ffdc2d2657
commit 03d9984f17
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ Installation
Images 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
@ -65,10 +65,11 @@ This is equivalent to running:
docker pull ubuntu docker pull ubuntu
Note that it will only if the image of that name does not already exist. Note that it will only be downloaded if an image of that name does
This is downloading a large binary so on first run can take a while. not already exist. This is downloading a large binary so on first
For that reason this define turns off the default 5 minute timeout run can take a while. For that reason this define turns off the
for exec. Note that you can also remove images you no longer need with: default 5 minute timeout for exec. Note that you can also remove
images you no longer need with:
.. code-block:: ruby .. code-block:: ruby
@ -79,8 +80,8 @@ for exec. Note that you can also remove images you no longer need with:
Containers Containers
~~~~~~~~~~ ~~~~~~~~~~
Now you have an image you can run commands within a container managed by Now you have an image where you can run commands within a container
docker. managed by docker.
.. code-block:: ruby .. code-block:: ruby
@ -103,7 +104,7 @@ Run also contains a number of optional parameters:
image => 'ubuntu', image => 'ubuntu',
command => '/bin/sh -c "while true; do echo hello world; sleep 1; done"', command => '/bin/sh -c "while true; do echo hello world; sleep 1; done"',
ports => ['4444', '4555'], ports => ['4444', '4555'],
volumes => ['/var/lib/counchdb', '/var/log'], volumes => ['/var/lib/couchdb', '/var/log'],
volumes_from => '6446ea52fbc9', volumes_from => '6446ea52fbc9',
memory_limit => 10485760, # bytes memory_limit => 10485760, # bytes
username => 'example', username => 'example',