Temporary disable boot2docker migration

Signed-off-by: Jeffrey Morgan <[email protected]>
docker-archive · Nov 3, 2015 · c2f2f53 · c2f2f53
1 parent 4992538
commit c2f2f53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/osx/installerplugins/managevmplugin/managevmpluginPane.m b/osx/installerplugins/managevmplugin/managevmpluginPane.m
@@ -236,9 +236,9 @@ - (void) didEnterPane:(InstallerSectionDirection)dir {
         self.migrateExtraLabel.stringValue = @"Your existing Docker Toolbox VM will not be affected. This should take about a minute.";
         self.statusImage.image = toolboxImage;
         self.upgrading = YES;
-    } else if ([self canMigrateBoot2DockerVM]) {
+    } /*else if ([self canMigrateBoot2DockerVM]) {
         self.statusImage.image = boot2dockerImage;
-    } else {
+    }*/ else {
         [self gotoNextPane];
     }
 

diff --git a/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin b/osx/mpkg/Plugins/managevmplugin.bundle/Contents/MacOS/managevmplugin
diff --git a/windows/Toolbox.iss b/windows/Toolbox.iss
@@ -52,7 +52,7 @@ Filename: "{win}\explorer.exe"; Parameters: "{userprograms}\Docker\"; Flags: pos
 [Tasks]
 Name: desktopicon; Description: "{cm:CreateDesktopIcon}"
 Name: modifypath; Description: "Add docker.exe && docker-machine.exe to &PATH"
-Name: upgradevm; Description: "Upgrade or Migrate Boot2Docker VM"
+Name: upgradevm; Description: "Upgrade Boot2Docker VM"
 
 [Components]
 Name: "Docker"; Description: "Docker Client for Windows" ; Types: full custom; Flags: fixed
@@ -398,10 +398,10 @@ begin
 			begin
 				if CanUpgradeVM() then begin
 					Success := UpgradeVM();
-				end
-				else begin
-					Success := MigrateVM();
 				end;
+				// else begin
+				//	Success := MigrateVM();
+				// end;
 			end;
 		end;