From abcc1b33c52c51a742d4ea840433e7f86abdd210 Mon Sep 17 00:00:00 2001 From: Jeff Morgan Date: Sat, 30 Aug 2014 06:15:42 -0700 Subject: [PATCH] Fixing setup for boot2docker CLI --- meteor/client/lib/boot2docker.js | 4 ++-- resources/install | 2 +- script/setup.sh | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/meteor/client/lib/boot2docker.js b/meteor/client/lib/boot2docker.js index 65333e8240..96015f50b7 100644 --- a/meteor/client/lib/boot2docker.js +++ b/meteor/client/lib/boot2docker.js @@ -2,7 +2,7 @@ var exec = require('exec'); var path = require('path'); boot2dockerexec = function (command, callback) { - exec(path.join(getBinDir(), 'boot2docker') + ' --lowerip=192.168.59.103 --upperip=192.168.59.103 ' + command, function(err, stdout) { + exec(path.join(getBinDir(), 'boot2docker') + ' ' + command, function(err, stdout) { callback(err, stdout); }); }; @@ -195,7 +195,7 @@ startBoot2Docker = function (callback) { console.log(err); console.log(stdout); if (err) { - if (err.indexOf('Waiting for VM to be started') !== -1) { + if (err.indexOf('Waiting for VM to be started') !== -1 || err.indexOf('..........') !== -1) { installBoot2DockerAddons(function (err) { callback(err); }); diff --git a/resources/install b/resources/install index f3535ec9fd..ca0698dbe8 100755 --- a/resources/install +++ b/resources/install @@ -35,7 +35,7 @@ echo ' ' > /Library/LaunchAgents/com.kitematic.route.plist -sudo -u $USER $DIR/boot2docker init --lowerip=192.168.59.103 --upperip=192.168.59.103 +sudo -u $USER $DIR/boot2docker init VBoxManage modifyvm boot2docker-vm --nic2 hostonly --nictype2 virtio --cableconnected2 on --hostonlyadapter2 vboxnet0 VBoxManage dhcpserver add --netname=vboxnet0 --ip=192.168.59.99 --netmask=255.255.255.0 --lowerip=192.168.59.103 --upperip=192.168.59.103 diff --git a/script/setup.sh b/script/setup.sh index 064d7be76b..c40c686e78 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -62,13 +62,11 @@ fi if [ ! -f $BASE_IMAGE_FILE ]; then - cp cache/$BASE_IMAGE_VERSION_FILE $BASE_IMAGE_FILE + cp ../cache/$BASE_IMAGE_VERSION_FILE $BASE_IMAGE_FILE fi -if [ ! -f $BOOT2DOCKER_CLI_FILE ]; then - cp cache/$BOOT2DOCKER_CLI_VERSION_FILE $BOOT2DOCKER_CLI_FILE - chmod +x $BOOT2DOCKER_CLI_FILE -fi +cp ../cache/$BOOT2DOCKER_CLI_VERSION_FILE $BOOT2DOCKER_CLI_FILE +chmod +x $BOOT2DOCKER_CLI_FILE popd