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

Use the sudo script for app volume

Browse Source
This commit is contained in:
Johannes Zellner
2018-09-14 14:37:20 +02:00
parent 56cd97147a
commit 3963eb687f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/apptask.js
View File

@@ -174,16 +174,17 @@ function deleteVolume(app, options, callback) {
// remove symlinked directory contents and not the symlink
const volumeDir = path.join(paths.APPS_DATA_DIR, app.id);
let resolvedVolumeDir = safe.fs.readlinkSync(volumeDir) || volumeDir;
const isSymlinked = safe.fs.readlinkSync(volumeDir) !== volumeDir;
rimraf(`${resolvedVolumeDir}/*`, function (error) {
// only remove folder contents if removeDirectory is falsy and we do have a symlink
const subdir = options.removeDirectory || isSymlinked ? '' : '*';
docker.removeVolume(app, app.id, subdir, function (error) {
if (error) {
debug(`deleteVolume: error removing ${resolvedVolumeDir}: ${error}`);
debug(`deleteVolume: error removing ${volumeDir} (symlink ${isSymlinked}): ${error}`);
return callback(error);
}
if (options.removeDirectory && !safe.fs.rmdirSync(volumeDir)) return callback(safe.error.code === 'ENOENT' ? null : safe.error);
callback();
});
}