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

apptask: better progress message

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-08-26 17:26:23 +02:00
parent 56ecfdb4eb
commit dca548b8a0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/apptask.js
View File

@@ -296,7 +296,7 @@ async function install(app, args, progressCallback) {
await verifyManifest(app.manifest);
// teardown for re-installs
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Deleting old containers' });
await reverseProxy.unconfigureApp(app);
await deleteContainers(app, { managedOnly: true });
@@ -406,7 +406,7 @@ async function create(app, args, progressCallback) {
assert.strictEqual(typeof args, 'object');
assert.strictEqual(typeof progressCallback, 'function');
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Deleting old container' });
await deleteContainers(app, { managedOnly: true });
// FIXME: re-setup addons only because sendmail addon to re-inject env vars on mailboxName change
@@ -432,7 +432,7 @@ async function changeLocation(app, args, progressCallback) {
const skipDnsSetup = args.skipDnsSetup;
const overwriteDns = args.overwriteDns;
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Unregistering old domains' });
await reverseProxy.unconfigureApp(app);
await deleteContainers(app, { managedOnly: true });
@@ -493,7 +493,7 @@ async function changeServices(app, args, progressCallback) {
assert.strictEqual(typeof args, 'object');
assert.strictEqual(typeof progressCallback, 'function');
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Deleting old containers' });
await deleteContainers(app, { managedOnly: true });
const unusedAddons = {};
@@ -526,7 +526,7 @@ async function migrateDataDir(app, args, progressCallback) {
assert(newStorageVolumeId === null || typeof newStorageVolumeId === 'string');
assert(newStorageVolumePrefix === null || typeof newStorageVolumePrefix === 'string');
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Deleting old containers' });
await deleteContainers(app, { managedOnly: true });
await progressCallback({ percent: 45, message: 'Ensuring app data directory' });
@@ -556,7 +556,7 @@ async function configure(app, args, progressCallback) {
assert.strictEqual(typeof args, 'object');
assert.strictEqual(typeof progressCallback, 'function');
await progressCallback({ percent: 10, message: 'Cleaning up old install' });
await progressCallback({ percent: 10, message: 'Deleting old containers' });
await reverseProxy.unconfigureApp(app);
await deleteContainers(app, { managedOnly: true });
@@ -625,7 +625,7 @@ async function update(app, args, progressCallback) {
// note: we cleanup first and then backup. this is done so that the app is not running should backup fail
// we cannot easily 'recover' from backup failures because we have to revert manfest and portBindings
await progressCallback({ percent: 35, message: 'Cleaning up old install' });
await progressCallback({ percent: 35, message: 'Deleting old containers' });
await deleteContainers(app, { managedOnly: true });
if (app.manifest.dockerImage !== updateConfig.manifest.dockerImage) await docker.deleteImage(app.manifest);