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

Merge branch 'master' of github.com:docker/toolbox 

Conflicts:
	windows/start.sh
This commit is contained in:
Jeffrey Morgan 2015-08-12 15:09:35 -07:00
parent 05ca1fc9a7 4f90253210
commit 13a8ca268a
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osx/Dockerfile
View File

@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re
ENV KITEMATIC_VERSION 0.8.1
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
ENV INSTALLER_VERSION 1.8.0a
ENV INSTALLER_VERSION 1.8.0b
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

4
osx/mpkg/Distribution
View File

@ -114,7 +114,7 @@
{
test = system.version['ProductVersion'];
system.log("OS version detected: " + test);
result = (system.compareVersions(test, '10.6') >= 0);
result = (system.compareVersions(test, '10.9') >= 0);
} catch (e) { system.log(e); result = false; }
if (!result)
@ -131,7 +131,7 @@
line checking for running VMs instead. */
if (vboxNeedsUpgrade()) {
system.log(vboxplist.CFBundleVersion);
rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep');
rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox|VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep');
result = (rcScript != 0);
system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);
}

BIN
osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/main.scpt
View File

Binary file not shown.

6
osx/mpkg/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh
View File

@ -21,13 +21,13 @@ fi
$VBOXMANAGE showvminfo $VM &> /dev/null
VM_EXISTS_CODE=$?
if [ $VM_EXISTS_CODE -ne 0 ]; then
if [ $VM_EXISTS_CODE -eq 1 ]; then
echo "Creating Machine $VM..."
$DOCKER_MACHINE rm -f $VM &> /dev/null
rm -rf ~/.docker/machine/machines/$VM
$DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
$DOCKER_MACHINE -D create -d virtualbox --virtualbox-memory 2048 $VM
else
echo "Machine $VM already exists."
echo "Machine $VM already exists in VirtualBox."
fi
echo "Starting machine $VM..."

2
windows/start.sh
View File

@ -32,7 +32,7 @@ echo "Starting machine $VM..."
$DOCKER_MACHINE start $VM
echo "Setting environment variables for machine $VM..."
eval "$($DOCKER_MACHINE env $VM 2>/dev/null)"
eval "$($DOCKER_MACHINE env $VM)"
clear
cat << EOF