From 5da80098c9b1c4d9f904cb4295a0c719d68a2cb9 Mon Sep 17 00:00:00 2001 From: Keith Starling Date: Mon, 2 Nov 2015 15:23:08 -0500 Subject: [PATCH] check to see if the boot2docker vm is running before starting it as docker-machine now seems to throw an error when starting a running VM Signed-off-by: Keith Starling --- .../quickstart.app/Contents/Resources/Scripts/start.sh | 7 +++++-- windows/start.sh | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh index e1f3632c..74c3c007 100755 --- a/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh +++ b/osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh @@ -30,8 +30,11 @@ else echo "Machine $VM already exists in VirtualBox." fi -echo "Starting machine $VM..." -$DOCKER_MACHINE start $VM +VM_STATUS=$($DOCKER_MACHINE status $VM) +if [ "$VM_STATUS" != "Running" ]; then + echo "Starting machine $VM..." + $DOCKER_MACHINE start $VM +fi echo "Setting environment variables for machine $VM..." clear diff --git a/windows/start.sh b/windows/start.sh index c1c0b368..771cece5 100644 --- a/windows/start.sh +++ b/windows/start.sh @@ -34,8 +34,11 @@ else echo "Machine $VM already exists in VirtualBox." fi -echo "Starting machine $VM..." -$DOCKER_MACHINE start $VM +VM_STATUS=$($DOCKER_MACHINE status $VM) +if [ "$VM_STATUS" != "Running" ]; then + echo "Starting machine $VM..." + $DOCKER_MACHINE start $VM +fi echo "Setting environment variables for machine $VM..." eval "$($DOCKER_MACHINE env --shell=bash $VM)"