Merge pull request #2757 from Painted-Fox/patch-2

Simplify the upstart example in host_integration.rst
This commit is contained in:
Andy Rothfusz 2013-11-19 10:29:54 -08:00
Родитель 434c1613a4 1da8c50ded
Коммит 4eaba8de91
1 изменённых файлов: 4 добавлений и 15 удалений

Просмотреть файл

@ -37,7 +37,7 @@ named ``/etc/init/redis.conf`` and place the following into it:
description "Redis container"
author "Me"
start on filesystem and started lxc-net and started docker
start on filesystem and started docker
stop on runlevel [!2345]
respawn
script
@ -49,23 +49,12 @@ named ``/etc/init/redis.conf`` and place the following into it:
/usr/bin/docker start -a 0a7e070b698b
end script
Next, we have to edit the docker upstart script (``/etc/init/docker.conf``)
so that we run docker with ``-r=false``. In this example, we also ensure
that docker will start running before *redis* is started.
Next, we have to configure docker so that it's run with the option ``-r=false``.
Run the following command:
.. code-block:: bash
description "Docker daemon"
start on filesystem and started lxc-net
start on (starting redis)
stop on runlevel [!2345]
respawn
script
/usr/bin/docker -d -r=false
end script
$ sudo sh -c "echo 'DOCKER_OPTS=\"-r=false\"' > /etc/default/docker"
Sample systemd Script