docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing setup for boot2docker CLI

This commit is contained in:
Jeff Morgan 2014-08-30 06:15:42 -07:00
parent 9d9ef25ee5
commit abcc1b33c5
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meteor/client/lib/boot2docker.js
View File

@ -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);
});

2
resources/install
View File

@ -35,7 +35,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>
</dict>
</plist>' > /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

8
script/setup.sh
View File

@ -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