Merge pull request #5577 from luciddg/fix/master/docker-provisioner-restart-fix

Use service command to restart docker, not upstart.
This commit is contained in:
Seth Vargo 2015-05-31 20:44:48 -07:00
commit 3017243a24
1 changed files with 1 additions and 2 deletions

View File

@ -7,8 +7,7 @@ module VagrantPlugins
machine.communicate.tap do |comm|
if !comm.test('grep -q \'\-r=true\' /etc/default/docker')
comm.sudo("echo 'DOCKER_OPTS=\"-r=true ${DOCKER_OPTS}\"' >> /etc/default/docker")
comm.sudo("stop docker")
comm.sudo("start docker")
comm.sudo("service docker restart")
# Wait some amount time for the pid to become available
# so that we don't start executing Docker commands until