diff --git a/CHANGES b/CHANGES index 8b6cdcd9c..bea1a85ef 100644 --- a/CHANGES +++ b/CHANGES @@ -2232,3 +2232,10 @@ [6.2.4] * Another addon crash fix +[6.2.5] +* update: set memory limit properly +* Fix bug where renew certs button did not work +* sftp: fix rebuild condition +* Fix display of user management/dashboard visiblity for email apps +* graphite: disable tagdb and reduce log noise + diff --git a/setup/start.sh b/setup/start.sh index 7ff218d74..23d4e33d0 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -45,7 +45,8 @@ mkdir -p "${APPS_DATA_DIR}" # keep these in sync with paths.js log "Ensuring directories" -mkdir -p "${PLATFORM_DATA_DIR}/graphite" +# clear out graphite, since old installations are having some db migration issue +rm -rf "${PLATFORM_DATA_DIR}/graphite" && mkdir -p "${PLATFORM_DATA_DIR}/graphite" mkdir -p "${PLATFORM_DATA_DIR}/mysql" mkdir -p "${PLATFORM_DATA_DIR}/postgresql" mkdir -p "${PLATFORM_DATA_DIR}/mongodb" diff --git a/src/graphite.js b/src/graphite.js index fa57723ab..08add8c53 100644 --- a/src/graphite.js +++ b/src/graphite.js @@ -19,7 +19,6 @@ function start(existingInfra, serviceConfig, callback) { assert.strictEqual(typeof callback, 'function'); const tag = infra.images.graphite.tag; - const dataDir = paths.PLATFORM_DATA_DIR; const memoryLimit = serviceConfig.memoryLimit || exports.DEFAULT_MEMORY_LIMIT; const memory = system.getMemoryAllocation(memoryLimit); @@ -38,7 +37,7 @@ function start(existingInfra, serviceConfig, callback) { -p 127.0.0.1:2003:2003 \ -p 127.0.0.1:2004:2004 \ -p 127.0.0.1:8417:8000 \ - -v "${dataDir}/graphite:/var/lib/graphite" \ + -v "${paths.PLATFORM_DATA_DIR}/graphite:/var/lib/graphite" \ --label isCloudronManaged=true \ --read-only -v /tmp -v /run "${tag}"`; diff --git a/src/infra_version.js b/src/infra_version.js index 0d8e6a897..26b39564a 100644 --- a/src/infra_version.js +++ b/src/infra_version.js @@ -21,7 +21,7 @@ exports = module.exports = { 'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.0.1@sha256:ad20a9a5dcb2ab132374a7c8d44b89af0ec37651cf889e570f7625b02ee85fdf' }, 'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.0.2@sha256:caaa1f7f4055ae8990d8ec65bd100567496df7e4ed5eb427867f3717a8dcbf92' }, 'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.2.3@sha256:fdc4aa6d2c85aeafe65eaa4243aada0cc2e57b94f6eaee02c9b1a8fb89b01dd7' }, - 'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.4.0@sha256:953bbd8b72a9108a8526d2c0bdbba67e1e1563ff59d0a117f0884dba1576f3dd' }, + 'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.4.1@sha256:b00b64b8df4032985d7a1ddd548a2713b6d7d88a54ebe9b7d324cece2bd6829e' }, 'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.2.0@sha256:61e8247ded1e07cf882ca478dab180960357c614472e80b938f1f690a46788c2' } } };