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

fix memoryLimit handling

Browse Source 
0 means not set. and it will follow value in manifest

part of #18
This commit is contained in:
Girish Ramakrishnan
2016-09-03 21:02:22 -07:00
parent f083d81b35
commit 7b4c9dffab
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/docker.js
View File

@@ -163,13 +163,14 @@ function createSubcontainer(app, name, cmd, options, callback) {
}
// first check db record, then manifest
var memoryLimit = app.memoryLimit || manifest.memoryLimit;
var memoryLimit = app.memoryLimit || manifest.memoryLimit || 0;
// ensure we never go below minimum
memoryLimit = memoryLimit < constants.DEFAULT_MEMORY_LIMIT ? constants.DEFAULT_MEMORY_LIMIT : memoryLimit; // 256mb by default
// developerMode does not restrict memory usage
memoryLimit = developmentMode ? 0 : memoryLimit;
if (developmentMode) {
// developerMode does not restrict memory usage
memoryLimit = 0;
} else if (memoryLimit === 0 || memoryLimit < constants.DEFAULT_MEMORY_LIMIT) { // ensure we never go below minimum (in case we change the default)
memoryLimit = constants.DEFAULT_MEMORY_LIMIT;
}
addons.getEnvironment(app, function (error, addonEnv) {
if (error) return callback(new Error('Error getting addon environment : ' + error));