docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make upgrade work with saved vms

This commit is contained in:
Jeffrey Morgan 2015-03-08 21:43:55 -04:00
parent 699f9bfe8c
commit 838b71fa51
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SetupStore.js
View File

@ -77,16 +77,17 @@ var _steps = [{
return; return;
} }
if ((yield machine.state()) === 'Saved') {
yield virtualBox.wake(machine.name());
}
var isoversion = machine.isoversion(); var isoversion = machine.isoversion();
var packagejson = util.packagejson(); var packagejson = util.packagejson();
if (!isoversion || setupUtil.compareVersions(isoversion, packagejson['docker-version']) < 0) { if (!isoversion || setupUtil.compareVersions(isoversion, packagejson['docker-version']) < 0) {
yield machine.stop(); yield machine.stop();
yield machine.upgrade(); yield machine.upgrade();
} }
var state = yield machine.state(); if ((yield machine.state()) !== 'Running') {
if (state === 'Saved') {
yield virtualBox.wake(machine.name());
} else if (state !== 'Running') {
yield machine.start(); yield machine.start();
yield machine.regenerateCerts(); yield machine.regenerateCerts();
} }