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

TESTING.md

@@ -1,7 +1,10 @@
 Docker Toolbox Testing
 ======================
 
-Testing is mostly manual for now. Below you'll find a checklist of cases that have been covered by each release:
+Testing is mostly manual for now. Below you'll find a checklist of cases that have been covered by each release.
+
+Things to try:
+- Old version of VirtualBox running with old version of Boot2Docker
 
 ## Toolbox 1.8.0 RC7
 
@@ -9,28 +12,46 @@ Testing is mostly manual for now. Below you'll find a checklist of cases that ha
 
 - [ ] Install + Quick Start
 - [ ] Install + Migrating Boot2Docker
+- [ ] Install + Start Kitematic 
 
 ### Mac OS X 10.10
 
 - [ ] Install + Quick Start
 - [ ] Install + Migrating Boot2Docker
+- [ ] Install + Start Kitematic 
 
 ### Mac OS X 10.9
 
 - [ ] Install + Quick Start
 - [ ] Install + Migrating Boot2Docker
+- [ ] Install + Start Kitematic 
 
 ### Windows 10
 
 - Currently unsupported by Toolbox as VirtualBox 5 does not yet support Windows 10.
 
-### Windows 8
+### Windows 8 (8.1) 
 
-- [ ] Install + Quick Start
+- [x] Install + Quick Start
-- [ ] Install + Migrating Boot2Docker
+- [failed] Install + Migrating Boot2Docker
+- [x] Install + Start Kitematic 
+*User may encourter Docker Machine errors. 
+** Boot2docker installer failed to work on the test PC 
+
+Clean install: 
+1. Open VirtualBox (if installed), and remove all the VMs by choosing Delete all files. 
+
+2. Open Control Panel -> Program and Features -> Uninstall Virtualbox 
+
+3. Uninstall Docker Toolbox (if installed) 
+
+4. Open "File Explorer" -> C:\Users\YOUR_USERNAME\ and delete .docker folder 
+ 
+5. Run toolbox installer again
 
 ### Windows 7
 
 - [x] Install + Quick Start
 - [x] Install + Migrating Boot2Docker
 - [x] Uninstalling
+*User may encourter Docker Machine errors. 

windows/Toolbox.iss

@@ -59,12 +59,12 @@ SolidCompression=yes
 WizardImageFile=windows-installer-side.bmp
 WizardSmallImageFile=windows-installer-logo.bmp
 WizardImageStretch=no
-WizardImageBackColor=$22B8EB
+WizardImageBackColor=$22EBB8
 
 ; in the installer itself:
 
 ; in the "Add/Remove" list:
-UninstallDisplayIcon={app}\toolbox.ico
+UninstallDisplayIcon={app}\unins000.exe
 
 SignTool=ksign /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f
 
@@ -202,10 +202,13 @@ var
   ResultCode: integer;
   WinHttpReq: Variant;
 begin
-  WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+  try
-  WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventStartedData}', false);
+    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-  WinHttpReq.SetRequestHeader('Content-Type', 'application/json');
+    WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventStartedData}', false);
-  WinHttpReq.Send('');
+    WinHttpReq.SetRequestHeader('Content-Type', 'application/json');
+    WinHttpReq.Send('');
+  except
+  end;
   // Proceed Setup
   Result := True;
 
@@ -347,10 +350,15 @@ begin
   begin
     if IsComponentSelected('DockerMachine') then
       MigrateVM();
-    WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
+
-    WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventFinishedData}', false);
+    try
-    WinHttpReq.SetRequestHeader('Content-Type', 'application/json');
+      WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1');
-    WinHttpReq.Send('');
+      WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventFinishedData}', false);
+      WinHttpReq.SetRequestHeader('Content-Type', 'application/json');
+      WinHttpReq.Send('');
+    except
+    end;
+
     if IsTaskSelected(taskname) then
 			ModPath();
   end