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

Fixing startup bug if boot2docker-vm already exists.

This commit is contained in:
Jeff Morgan 2014-08-30 02:55:49 -07:00
parent 4c7f6affb9
commit 2e3fc3d627
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/install
View File

@ -36,6 +36,8 @@ echo '<?xml version="1.0" encoding="UTF-8"?>
</plist>' > /Library/LaunchAgents/com.kitematic.route.plist
sudo -u $USER $DIR/boot2docker init --lowerip=192.168.59.103 --upperip=192.168.59.103
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
# Add entries to routing table for Kitematic VM
/sbin/route delete 172.17.0.0/16 192.168.59.103

6
script/dist.sh
View File

@ -6,6 +6,7 @@ source $DIR/colors.sh
source $DIR/versions.sh
BASE=$DIR/..
pushd $BASE
if [ ! -d bundle ]; then
@ -18,6 +19,7 @@ rm -rf dist/osx/Kitematic.zip
mkdir -p dist/osx/
cecho "-----> Creating Kitematic.app..." $blue
find cache/node-webkit -name "debug\.log" -print0 | xargs -0 rm -rf
cp -R cache/node-webkit/node-webkit.app dist/osx/
mv dist/osx/node-webkit.app dist/osx/Kitematic.app
mkdir -p dist/osx/Kitematic.app/Contents/Resources/app.nw
@ -50,8 +52,8 @@ if [ -f $DIR/sign.sh ]; then
fi
pushd dist/osx
cecho "-----> Creating disributable zip file...." $blue
zip -rq --display-dots Kitematic.zip Kitematic.app
cecho "-----> Creating disributable zip file...." $blue
ditto -c -k --sequesterRsrc --keepParent Kitematic.app Kitematic.zip
popd
cecho "Done." $green

4
script/versions.sh
View File

@ -4,8 +4,8 @@ BASE_IMAGE_FILE=base-images.tar.gz
VIRTUALBOX_FILE=virtualbox-4.3.12.pkg
BOOT2DOCKER_CLI_VERSION=1.1.2
BOOT2DOCKER_CLI_VERSION=1.2.0
BOOT2DOCKER_CLI_VERSION_FILE=boot2docker-$BOOT2DOCKER_CLI_VERSION
BOOT2DOCKER_CLI_FILE=boot2docker
COCOASUDO_FILE=cocoasudo
COCOASUDO_FILE=cocoasudo