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

This commit is contained in:
Jeffrey Morgan 2015-07-14 00:11:06 -07:00
parent 9c45387256 ce6cecc080
commit 10ecaa6f6e
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION Normal file
View File

@ -0,0 +1 @@
1.7.0

13
osx/mpkg/Resources/en.lproj/Welcome.html
View File

@ -8,16 +8,17 @@
<p> <p>
This installer guides you through an installation of This installer guides you through an installation of
<b>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</b>. <strong>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</strong>.
</p> </p>
<p> <p>
The Docker Toolbox installer includes the following: The Docker Toolbox installer includes the following:
</p> </p>
<ul> <ul>
<li>the Docker Engine <code>docker</code> binary <li>Docker Engine <code>docker</code> binary </li>
<li>the Docker Machine <code>docker-machine</code> binary <li>Docker Machine <code>docker-machine</code> binary </li>
<li>the Docker Compose <code>docker-compose</code> binary <li>Docker Compose <code>docker-compose</code> binary </li>
<li>a shell preconfigured as a Docker command line environment <li>Kitematic - Desktop GUI for Docker </li>
<li>a shell preconfigured as a Docker command line environment </li>
</ul> </ul>
<br/> <br/>
<p> <p>
@ -25,7 +26,7 @@
</p> </p>
<p> <p>
To continue, click <b>Continue</b>. To continue, click <strong>Continue</strong>.
</p> </p>
</body> </body>
</html> </html>

7
windows/start.sh
View File

@ -1,4 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
ISO=$HOME/.docker/machine/cache/boot2docker.iso ISO=$HOME/.docker/machine/cache/boot2docker.iso
VM=dev VM=dev
DOCKER_MACHINE=./docker-machine.exe DOCKER_MACHINE=./docker-machine.exe
@ -9,7 +12,7 @@ if [ ! -f $ISO ]; then
cp ./boot2docker.iso "$ISO" cp ./boot2docker.iso "$ISO"
fi fi
machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") || :
if [ -z $machine ]; then if [ -z $machine ]; then
echo "Creating Machine $VM..." echo "Creating Machine $VM..."
$DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
@ -26,8 +29,8 @@ echo "Setting environment variables for machine $VM..."
eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')" eval "$(./docker-machine.exe env $VM 2>/dev/null | sed 's,\\,\\\\,g')"
cd cd
clear
clear
cat << EOF cat << EOF