jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not do dataDir move in configure

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-09-23 07:15:36 -07:00
parent bfe6389f62
commit ec1f0f9320
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/apptask.js
View File

@@ -770,7 +770,6 @@ function configure(app, args, progressCallback, callback) {
const oldConfig = args.oldConfig || {}; // this can be null in repair cases
const locationChanged = oldConfig.fqdn !== app.fqdn;
const dataDirChanged = oldConfig.dataDir !== app.dataDir;
async.series([
progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
@@ -809,13 +808,6 @@ function configure(app, args, progressCallback, callback) {
progressCallback.bind(null, { percent: 50, message: 'Setting up addons' }),
addons.setupAddons.bind(null, app, app.manifest.addons),
// migrate dataDir
function (next) {
if (!dataDirChanged) return next();
moveDataDir(app, oldConfig.dataDir, next);
},
progressCallback.bind(null, { percent: 60, message: 'Creating container' }),
createContainer.bind(null, app),
@@ -1059,7 +1051,7 @@ function run(appId, args, progressCallback, callback) {
case apps.ISTATE_PENDING_CLONE:
case apps.ISTATE_PENDING_RESTORE:
return install(app, args, progressCallback, callback);
case apps.ISTATE_PENDING_REPAIR:
case apps.ISTATE_PENDING_REPAIR: {
let prevState = args.error && args.error.task ? args.error.task.installationState : apps.ISTATE_PENDING_CONFIGURE;
if (prevState === apps.ISTATE_PENDING_UNINSTALL) {
return uninstall(app, error.task.args, progressCallback, callback);
@@ -1072,6 +1064,7 @@ function run(appId, args, progressCallback, callback) {
} else {
return configure(app, args, progressCallback, callback);
}
}
case apps.ISTATE_PENDING_CONFIGURE:
return configure(app, args, progressCallback, callback);
case apps.ISTATE_PENDING_RECREATE_CONTAINER: