From 544f4040373e839ddb95dac9eef9d70eace660c7 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 15 Apr 2014 12:18:37 -0700 Subject: [PATCH] provisioners/docker: configure autostart works if OS can't check status --- .../docker/cap/debian/docker_configure_auto_start.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb index f8a225609..d583322d6 100644 --- a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb +++ b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb @@ -13,9 +13,15 @@ module VagrantPlugins # Wait some amount time for the pid to become available # so that we don't start executing Docker commands until # it is available. - [0, 1, 2, 4].each do |delay| - sleep delay - break if machine.guest.capability(:docker_daemon_running) + if machine.guest.capability?(:docker_daemon_running) + [0, 1, 2, 4].each do |delay| + sleep delay + break if machine.guest.capability(:docker_daemon_running) + end + else + # This OS doesn't support checking if Docker is running, + # so just wait 5 seconds. + sleep 5 end end end