Compare commits

...

5 Commits
v7.7.2 ... 7.7

Author SHA1 Message Date
Girish Ramakrishnan
09e00e6d58 scheduler: typo 2024-03-12 17:54:51 +01:00
Johannes Zellner
09d2a63cbb We defer slider changes 2024-03-12 16:07:44 +01:00
Girish Ramakrishnan
8c062a8828 7.7.1 changes 2024-03-12 16:07:44 +01:00
Girish Ramakrishnan
c707daf946 postgresql: fix whitelist ext loading 2024-03-12 16:07:44 +01:00
Girish Ramakrishnan
0a91e6b2c0 scheduler: do not create jobs of suspended apps
otherwise, when an app is uninstalling, it creates the docker containers
by calling getDynamicEnvironment. This ends up adding addonConfigs for the
docker addon and prevents the app from getting uninstalled.
2024-03-11 23:34:08 +01:00
3 changed files with 7 additions and 2 deletions

View File

@@ -2753,3 +2753,6 @@
* Fix streaming of logs with `logPaths`
* profile: store user language setting in the database
[7.7.1]
* postgresql: fix bug in loading of contrib extensions

View File

@@ -16,7 +16,7 @@ exports = module.exports = {
'mail': 'registry.docker.com/cloudron/mail:3.12.1@sha256:f539bea6c7360d3c0aa604323847172359593f109b304bb2d2c5152ca56be05c',
'mongodb': 'registry.docker.com/cloudron/mongodb:6.0.0@sha256:1108319805acfb66115aa96a8fdbf2cded28d46da0e04d171a87ec734b453d1e',
'mysql': 'registry.docker.com/cloudron/mysql:3.4.2@sha256:379749708186a89f4ae09d6b23b58bc6d99a2005bac32e812b4b1dafa47071e4',
'postgresql': 'registry.docker.com/cloudron/postgresql:5.2.0@sha256:5e1cd57a34d2bf7fa29a4fb90bcc07acf68f0d832283ed58464512a313e794b1',
'postgresql': 'registry.docker.com/cloudron/postgresql:5.2.1@sha256:5ef3aea8873da25ea5e682e458b11c99fc8df25ae90c7695a6f40bda8d120057',
'redis': 'registry.docker.com/cloudron/redis:3.5.2@sha256:5c3d9a912d3ad723b195cfcbe9f44956a2aa88f9e29f7da3ef725162f8e2829a',
'sftp': 'registry.docker.com/cloudron/sftp:3.8.6@sha256:6b4e3f192c23eadb21d2035ba05f8432d7961330edb93921f36a4eaa60c4a4aa',
'turn': 'registry.docker.com/cloudron/turn:1.7.2@sha256:9ed8da613c1edc5cb8700657cf6e49f0f285b446222a8f459f80919945352f6d',

View File

@@ -136,7 +136,7 @@ async function sync() {
if (_.isEqual(appState.schedulerConfig, schedulerConfig) && appState.containerId === app.containerId) continue; // nothing changed
}
debug(`sync: adding jobs of ${app.id} (${app.fqdn})`);
debug(`sync: clearing jobs of ${app.id} (${app.fqdn})`);
const [error] = await safe(stopJobs(app.id, appState));
if (error) debug(`sync: error stopping jobs of ${app.id} : ${error.message}`);
@@ -146,6 +146,8 @@ async function sync() {
continue;
}
if (gSuspendedAppIds.has(app.id)) continue; // do not create jobs of suspended apps
const cronJobs = await createJobs(app, schedulerConfig); // if docker is down, the next sync() will recreate everything for this app
gState[app.id] = { containerId: app.containerId, schedulerConfig, cronJobs };
}