From 77ad0f4535c291346bf28fb3c96332ac73a2193a Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 10 Aug 2015 15:54:27 -0700 Subject: [PATCH 1/5] Update TESTING.md --- TESTING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/TESTING.md b/TESTING.md index eaa4934e0b..949115d3b1 100644 --- a/TESTING.md +++ b/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 From 720737be0557765b11713db15bd9f25d86cd5be7 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 10 Aug 2015 18:58:07 -0700 Subject: [PATCH 2/5] update testing to include KM. --- TESTING.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/TESTING.md b/TESTING.md index 949115d3b1..4c4cc34a72 100644 --- a/TESTING.md +++ b/TESTING.md @@ -12,25 +12,29 @@ Things to try: - [ ] 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 - [ ] Install + Migrating Boot2Docker +- [ ] Install + Start Kitematic ### Windows 7 From d6fdd12a20a1b96a7b8144510a25ecf3f5f75f9d Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 10 Aug 2015 19:42:22 -0700 Subject: [PATCH 3/5] update --- TESTING.md | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/TESTING.md b/TESTING.md index 4c4cc34a72..aba3621961 100644 --- a/TESTING.md +++ b/TESTING.md @@ -32,12 +32,22 @@ Things to try: ### Windows 8 (8.1) -- [ ] Install + Quick Start -- [ ] Install + Migrating Boot2Docker -- [ ] Install + Start Kitematic +- [x] Install + Quick Start +- [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. From 26d3c76e65ab72ac5952dfc96fabba7c9a646e20 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 10 Aug 2015 19:43:03 -0700 Subject: [PATCH 4/5] update --- TESTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TESTING.md b/TESTING.md index aba3621961..4a4d90e9ff 100644 --- a/TESTING.md +++ b/TESTING.md @@ -40,9 +40,13 @@ Things to try: 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 From 3c8554806145ca509c3454b2fb0710c379612f43 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Mon, 10 Aug 2015 20:16:26 -0700 Subject: [PATCH 5/5] Fix small toolbox bugs --- windows/Toolbox.iss | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss index 5b530a0cdb..037d44fdfd 100644 --- a/windows/Toolbox.iss +++ b/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'); - WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventStartedData}', false); - WinHttpReq.SetRequestHeader('Content-Type', 'application/json'); - WinHttpReq.Send(''); + try + WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1'); + WinHttpReq.Open('POST', 'https://api.mixpanel.com/track/?data={#EventStartedData}', false); + 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); - WinHttpReq.SetRequestHeader('Content-Type', 'application/json'); - WinHttpReq.Send(''); + + try + WinHttpReq := CreateOleObject('WinHttp.WinHttpRequest.5.1'); + 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