diff --git a/CHANGES b/CHANGES index 7ce55c4be..2d89437dc 100644 --- a/CHANGES +++ b/CHANGES @@ -2619,4 +2619,5 @@ [7.4.1] * support: Fix issue where app support tickets could not be opened * reverseproxy: prevent duplication of STS header +* services: fix issue with timeout when restoring large databases diff --git a/src/infra_version.js b/src/infra_version.js index 8f5962930..fc06ad3b3 100644 --- a/src/infra_version.js +++ b/src/infra_version.js @@ -16,10 +16,10 @@ exports = module.exports = { // docker inspect --format='{{index .RepoDigests 0}}' $IMAGE to get the sha256 'images': { 'turn': { repo: 'cloudron/turn', tag: 'cloudron/turn:1.5.0@sha256:c59a6da9ea55073ede1ba6329739fca72eddf64c3a3c10280bcc5b7fb8197865' }, - 'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:3.3.2@sha256:c19ca4f39ba87fe0c2e99c8bda6c99c1cd1ed3c7a5e331cfe6ec03935675442b' }, - 'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:5.0.1@sha256:51e0676df61aa61f292bf8abbdd7851e351c7580869d46c84f51bd4859644e07' }, - 'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.3.1@sha256:6f20108f62d9c41c3325f37253ecb26e8d6a6a03a405a782aa31262e1b64d08b' }, - 'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.4.0@sha256:19680fcf9b36720468674e85b2d9ad085da759dc08811ee547474c32ce70bf99' }, + 'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:3.3.3@sha256:85d74901e466cf8e39f92947d906b3687f109a1d2918210771a01625a57ece2f' }, + 'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:5.0.2@sha256:59ae57380b12a8e0d444175cf935c7019290d7f3c26f01b764df87e5e279714b' }, + 'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:4.3.2@sha256:ef5f03958e186928fc64d071e5a5719bd19f2c1e2d49a03bc10ee84b3e2aa114' }, + 'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:3.4.1@sha256:6a538d01bd1efa01b0997f16698b7d2ef5b5f7604c235fa20570494af28f1da6' }, 'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:3.8.3@sha256:877a1afb99e8cae8c82d5a2fca77840425eb7fafc24360fdd1c9c299e41bcfeb' }, 'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:3.3.0@sha256:005addac7e7576f3960b562404ce59442bc861626af0ae0f5122484f5bfcbbc1' }, 'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:3.7.1@sha256:e2eb96516379d07548ac5a758a1f57a54772493174de3096705397b34e42de1a' } diff --git a/src/server.js b/src/server.js index 685e2eb0d..c766a95c3 100644 --- a/src/server.js +++ b/src/server.js @@ -381,6 +381,7 @@ async function initializeExpressSync() { // disable server socket "idle" timeout. we use the timeout middleware to handle timeouts on a route level // we rely on nginx for timeouts on the TCP level (see client_header_timeout) httpServer.setTimeout(0); + httpServer.requestTimeout = 1000 * 60 * 60; // this value changed in node 18 to 5 mins // upgrade handler httpServer.on('upgrade', function (req, socket, head) {