Windows installer style changes

windows/Toolbox.iss

@@ -45,18 +45,20 @@ DefaultGroupName=Docker Inc
 OutputBaseFilename=docker-toolbox
 Compression=lzma
 SolidCompression=yes
-WizardImageFile=logo-docker-side.bmp
+WizardImageFile=windows-installer-side.bmp
-WizardSmallImageFile=logo-docker-small.bmp
+WizardSmallImageFile=windows-installer-logo.bmp
 WizardImageStretch=no
 WizardImageBackColor=$325461
 
 ; in the installer itself:
-SetupIconFile=toolbox.ico
+
 ; in the "Add/Remove" list:
 UninstallDisplayIcon={app}\toolbox.ico
 
 SignTool=ksign /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f
 
+SetupIconFile=toolbox.ico
+
 ; for modpath.iss
 ChangesEnvironment=true
 
@@ -75,8 +77,8 @@ Name: rebootwindows; Description: "&Reboot Windows at the end of installation";
 
 [Components]
 Name: "Docker"; Description: "Docker Client for Windows" ; Types: full upgrade
+Name: "DockerMachine"; Description: "Docker Machine for Windows" ; Types: full upgrade
 Name: "Kitematic"; Description: "Kitematic for Windows" ; Types: full upgrade
-Name: "Boot2Docker"; Description: "Boot2Docker ISO" ; Types: full upgrade
 Name: "VirtualBox"; Description: "VirtualBox"; Types: full
 Name: "MSYS"; Description: "MSYS-git UNIX tools"; Types: full
 
@@ -85,15 +87,17 @@ Source: ".\toolbox.ico"; DestDir: "{app}"; Flags: ignoreversion
 
 ; Docker
 Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
-Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
 Source: ".\start.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
 Source: ".\delete.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
 
+; DockerMachine
+Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"
+
 ; Kitematic
 Source: "{#kitematicSetup}"; DestDir: "{app}\installers\kitematic"; Flags: ignoreversion; AfterInstall: RunInstallKitematic(); Components: "Kitematic"
 
 ; Boot2Docker
-Source: "{#b2dIso}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Boot2Docker"
+Source: "{#b2dIso}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"
 
 ; msys-Git
 Source: "{#msysGit}"; DestDir: "{app}\installers\msys-git"; DestName: "msys-git.exe"; AfterInstall: RunInstallMSYS();  Components: "MSYS"
@@ -106,10 +110,10 @@ Source: "{#virtualBoxMsi}"; DestDir: "{app}\installers\virtualbox"; DestName: "v
 
 [Icons]
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"
+Name: "{group}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker"
-Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Tasks: desktopicon
+Name: "{commondesktop}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Tasks: desktopicon; Components: "Docker"
-Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"
+Name: "{commonprograms}\Docker CLI"; WorkingDir: "{app}"; Filename: "{app}\start.sh"; IconFilename: "{app}/toolbox.ico"; Components: "Docker"
-Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"
+Name: "{group}\Delete VirtualBox Dev VM"; WorkingDir: "{app}"; Filename: "{app}\delete.sh"; Components: "DockerMachine"
 
 [UninstallRun]
 Filename: "{app}\delete.sh"

windows/start.sh

@@ -1,37 +1,45 @@
 #!/bin/bash
-set -e
+ISO=$HOME/.docker/machine/cache/boot2docker.iso
+VM=dev
+DOCKER_MACHINE=./docker-machine.exe
 
-# clear the MSYS MOTD
+mkdir -p ~/.docker/machine/cache
-clear
+if [ ! -f $ISO ]; then
-
-cd "$(dirname "$BASH_SOURCE")"
-
-ISO="$HOME/.boot2docker/boot2docker.iso"
-
-if [ ! -e "$ISO" ]; then
-	echo 'copying initial boot2docker.iso (run "boot2docker.exe download" to update)'
 	mkdir -p "$(dirname "$ISO")"
 	cp ./boot2docker.iso "$ISO"
 fi
 
-echo 'initializing...'
+machine=$($DOCKER_MACHINE ls -q | grep "^$VM$")
-./boot2docker.exe init
+if [ -z $machine ]; then
+  echo "Creating Machine $VM..."
+   $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
+else
+  echo "Machine $VM already exists."
+fi
+
+echo "Starting machine $VM..."
+$DOCKER_MACHINE start dev
+
+echo "Setting environment variables for machine $VM..."
+./docker-machine.exe env $VM | sed  's,\\,\\\\,g' # eval swallows single backslashes in windows style path
+
+eval "$(./docker-machine.exe env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
+clear
+
+cat << EOF
+                        ##         .
+                  ## ## ##        ==
+               ## ## ## ## ##    ===
+           /"""""""""""""""""\___/ ===
+      ~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ /  ===- ~~~
+           \______ o           __/
+             \    \         __/
+              \____\_______/
+
+EOF
+echo
+echo "Your shell is configured to use docker with the VM: $VM"
+echo "You can ssh into the VM via 'docker-machine ssh $VM'"
 echo
 
-echo 'starting...'
-./boot2docker.exe start
-echo
-
-echo 'IP address of docker VM:'
-./boot2docker.exe ip
-echo
-
-echo 'setting environment variables ...'
-./boot2docker.exe shellinit | sed  's,\\,\\\\,g' # eval swallows single backslashes in windows style path
-eval "$(./boot2docker.exe shellinit 2>/dev/null | sed  's,\\,\\\\,g')"
-echo
-
-echo 'You can now use `docker` directly, or `boot2docker ssh` to log into the VM.'
-
-cd
 exec "$BASH" --login -i