diff --git a/package-lock.json b/package-lock.json index acef12892..dbfd1d4da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "aws-sdk": "^2.1115.0", "basic-auth": "^2.0.1", "body-parser": "^1.20.0", - "cloudron-manifestformat": "^5.18.0", + "cloudron-manifestformat": "^5.19.0", "connect": "^3.7.0", "connect-lastmile": "^2.1.1", "connect-timeout": "^1.9.0", @@ -1449,9 +1449,9 @@ } }, "node_modules/cloudron-manifestformat": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-5.18.0.tgz", - "integrity": "sha512-unyKazF7x0fJNZj00hxhSESKEerb5VAfperJZ61BG0p6JyFj2ztXprrc8g1KkVLOsyyt7qH3prxOhv/qUsOwDQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-5.19.0.tgz", + "integrity": "sha512-y2emFvxOzbOrUNxF2tUvCezh+VLCoFXN7Lcjww1zcoaA/ZAl091gcqP59Iyu8xzePC8J+MXA2nvZmePC+uG6eQ==", "dependencies": { "cron": "^1.8.2", "java-packagename-regex": "^1.0.0", @@ -9341,9 +9341,9 @@ } }, "cloudron-manifestformat": { - "version": "5.18.0", - "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-5.18.0.tgz", - "integrity": "sha512-unyKazF7x0fJNZj00hxhSESKEerb5VAfperJZ61BG0p6JyFj2ztXprrc8g1KkVLOsyyt7qH3prxOhv/qUsOwDQ==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/cloudron-manifestformat/-/cloudron-manifestformat-5.19.0.tgz", + "integrity": "sha512-y2emFvxOzbOrUNxF2tUvCezh+VLCoFXN7Lcjww1zcoaA/ZAl091gcqP59Iyu8xzePC8J+MXA2nvZmePC+uG6eQ==", "requires": { "cron": "^1.8.2", "java-packagename-regex": "^1.0.0", diff --git a/package.json b/package.json index 7b721757a..e17afed0a 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "aws-sdk": "^2.1115.0", "basic-auth": "^2.0.1", "body-parser": "^1.20.0", - "cloudron-manifestformat": "^5.18.0", + "cloudron-manifestformat": "^5.19.0", "connect": "^3.7.0", "connect-lastmile": "^2.1.1", "connect-timeout": "^1.9.0", diff --git a/src/docker.js b/src/docker.js index 1692cd915..ea8d2cfea 100644 --- a/src/docker.js +++ b/src/docker.js @@ -315,6 +315,13 @@ async function createSubcontainer(app, name, cmd, options) { const mounts = await getMounts(app); const addonEnv = await services.getEnvironment(app); + const runtimeVolumes = { + '/tmp': {}, + '/run': {} + }; + if (app.manifest.runtimeDirs) { + app.manifest.runtimeDirs.forEach(dir => runtimeVolumes[dir] = {}); + } let containerOptions = { name: name, // for referencing containers @@ -323,10 +330,7 @@ async function createSubcontainer(app, name, cmd, options) { Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd, Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv).concat(secondaryDomainsEnv), ExposedPorts: isAppContainer ? exposedPorts : { }, - Volumes: { // see also ReadonlyRootfs - '/tmp': {}, - '/run': {} - }, + Volumes: runtimeVolumes, Labels: { 'fqdn': app.fqdn, 'appId': app.id,