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

uninstall: must continue to teardown other addons

Browse Source
This commit is contained in:
Girish Ramakrishnan
2026-03-18 15:26:06 +05:30
parent d7212e69b5
commit e3d76ea9f4
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+4 -4
View File
@@ -332,7 +332,7 @@ async function uninstallCommand(app, args, progressCallback) {
await progressCallback({ percent: 30, message: 'Teardown addons' });
// if install/clone/restore/import failed early (e.g. invalid image), services may not have started
await safe(services.teardownAddons(app, app.manifest.addons), { debug: log });
await services.teardownAddons(app, app.manifest.addons, { ignoreError: true });
await services.teardownPersistentDirs(app);
await progressCallback({ percent: 40, message: 'Cleanup file manager' });
@@ -409,7 +409,7 @@ async function installCommand(app, args, progressCallback) {
// when restoring, app does not require these addons anymore. remove carefully to preserve the db passwords
if (oldManifest) {
const addonsToRemove = _.omit(oldManifest.addons, Object.keys(app.manifest.addons));
await services.teardownAddons(app, addonsToRemove);
await services.teardownAddons(app, addonsToRemove, {});
}
if (!restoreConfig || restoreConfig.remotePath || restoreConfig.backupId) { // install/import/restore but not in-place import should delete data dir
@@ -603,7 +603,7 @@ async function changeServicesCommand(app, args, progressCallback) {
if (app.manifest.addons?.redis && !app.enableRedis) unusedAddons.redis = app.manifest.addons.redis;
await progressCallback({ percent: 20, message: 'Removing unused addons' });
await services.teardownAddons(app, unusedAddons);
await services.teardownAddons(app, unusedAddons, {});
await progressCallback({ percent: 40, message: 'Setting up addons' });
await services.setupAddons(app, app.manifest.addons);
@@ -728,7 +728,7 @@ async function updateCommand(app, args, progressCallback) {
if (app.manifest.dockerImage !== updateConfig.manifest.dockerImage) await docker.deleteImage(app.manifest.dockerImage);
// only delete unused addons after backup
await services.teardownAddons(app, unusedAddons);
await services.teardownAddons(app, unusedAddons, {});
if (Object.keys(unusedAddons).includes('localstorage')) await updateApp(app, { storageVolumeId: null, storageVolumePrefix: null }); // lose reference
// teardown persistent dirs removed in the new manifest