Skip to content
This repository was archived by the owner on Sep 26, 2021. It is now read-only.

Commit c2f2f53

Browse files
committed
Temporary disable boot2docker migration
Signed-off-by: Jeffrey Morgan <[email protected]>
1 parent 4992538 commit c2f2f53

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

osx/installerplugins/managevmplugin/managevmpluginPane.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,9 @@ - (void) didEnterPane:(InstallerSectionDirection)dir {
236236
self.migrateExtraLabel.stringValue = @"Your existing Docker Toolbox VM will not be affected. This should take about a minute.";
237237
self.statusImage.image = toolboxImage;
238238
self.upgrading = YES;
239-
} else if ([self canMigrateBoot2DockerVM]) {
239+
} /*else if ([self canMigrateBoot2DockerVM]) {
240240
self.statusImage.image = boot2dockerImage;
241-
} else {
241+
}*/ else {
242242
[self gotoNextPane];
243243
}
244244

Binary file not shown.

windows/Toolbox.iss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Filename: "{win}\explorer.exe"; Parameters: "{userprograms}\Docker\"; Flags: pos
5252
[Tasks]
5353
Name: desktopicon; Description: "{cm:CreateDesktopIcon}"
5454
Name: modifypath; Description: "Add docker.exe && docker-machine.exe to &PATH"
55-
Name: upgradevm; Description: "Upgrade or Migrate Boot2Docker VM"
55+
Name: upgradevm; Description: "Upgrade Boot2Docker VM"
5656

5757
[Components]
5858
Name: "Docker"; Description: "Docker Client for Windows" ; Types: full custom; Flags: fixed
@@ -398,10 +398,10 @@ begin
398398
begin
399399
if CanUpgradeVM() then begin
400400
Success := UpgradeVM();
401-
end
402-
else begin
403-
Success := MigrateVM();
404401
end;
402+
// else begin
403+
// Success := MigrateVM();
404+
// end;
405405
end;
406406
end;
407407

0 commit comments

Comments
 (0)