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

do not wait for container in recovery mode

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-10-01 14:38:47 -07:00
parent 6a3cec3de8
commit e31cf4cbfe
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/services.js
View File

@@ -1143,9 +1143,10 @@ async function startMysql(existingInfra) {
await shell.promises.exec('removeMysql', 'docker rm -f mysql || true');
await shell.promises.exec('startMysql', runCmd);
await waitForContainer('mysql', 'CLOUDRON_MYSQL_TOKEN');
if (upgrading) await importDatabase('mysql');
if (!serviceConfig.recoveryMode) {
await waitForContainer('mysql', 'CLOUDRON_MYSQL_TOKEN');
if (upgrading) await importDatabase('mysql');
}
}
async function setupMySql(app, options) {
@@ -1347,8 +1348,10 @@ async function startPostgresql(existingInfra) {
await shell.promises.exec('removePostgresql', 'docker rm -f postgresql || true');
await shell.promises.exec('startPostgresql', runCmd);
await waitForContainer('postgresql', 'CLOUDRON_POSTGRESQL_TOKEN');
if (upgrading) await importDatabase('postgresql');
if (!serviceConfig.recoveryMode) {
await waitForContainer('postgresql', 'CLOUDRON_POSTGRESQL_TOKEN');
if (upgrading) await importDatabase('postgresql');
}
}
async function setupPostgreSql(app, options) {
@@ -1508,8 +1511,10 @@ async function startMongodb(existingInfra) {
await shell.promises.exec('removeMongodb', 'docker rm -f mongodb || true');
await shell.promises.exec('startMongodb', runCmd);
await waitForContainer('mongodb', 'CLOUDRON_MONGODB_TOKEN');
if (upgrading) await importDatabase('mongodb');
if (!serviceConfig.recoveryMode) {
await waitForContainer('mongodb', 'CLOUDRON_MONGODB_TOKEN');
if (upgrading) await importDatabase('mongodb');
}
}
async function setupMongoDb(app, options) {
@@ -1782,8 +1787,10 @@ async function setupRedis(app, options) {
debug(`Re-using existing redis container with state: ${JSON.stringify(result.State)}`);
}
await addonConfigs.set(app.id, 'redis', env);
await waitForContainer('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');
if (!recoveryMode) {
await addonConfigs.set(app.id, 'redis', env);
await waitForContainer('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');
}
}
async function clearRedis(app, options) {