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

make execContainer take options arg

Browse Source
This commit is contained in:
Girish Ramakrishnan
2016-04-18 11:42:34 -07:00
parent 491356ce8d
commit 4f82bcec43
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/addons.js
View File

@@ -423,7 +423,7 @@ function setupMySql(app, options, callback) {
var cmd = [ '/addons/mysql/service.sh', options.multipleDatabases ? 'add-prefix' : 'add', app.id ];
docker.execContainer('mysql', cmd, null /* input */, function (error, stdout) {
docker.execContainer('mysql', cmd, function (error, stdout) {
if (error) return callback(error);
var env = stdout.toString('utf8').split('\n').slice(0, -1); // remove trailing newline
@@ -441,7 +441,7 @@ function teardownMySql(app, options, callback) {
debugApp(app, 'Tearing down mysql');
docker.execContainer('mysql', cmd, null /* input */, function (error) {
docker.execContainer('mysql', cmd, function (error) {
if (error) return callback(error);
appdb.unsetAddonConfig(app.id, 'mysql', callback);
@@ -501,7 +501,7 @@ function setupPostgreSql(app, options, callback) {
var cmd = [ '/addons/postgresql/service.sh', 'add', app.id ];
docker.execContainer('postgresql', cmd, null /* input */, function (error, stdout) {
docker.execContainer('postgresql', cmd, function (error, stdout) {
if (error) return callback(error);
var env = stdout.toString('utf8').split('\n').slice(0, -1); // remove trailing newline
@@ -519,7 +519,7 @@ function teardownPostgreSql(app, options, callback) {
debugApp(app, 'Tearing down postgresql');
docker.execContainer('postgresql', cmd, null /* input */, function (error) {
docker.execContainer('postgresql', cmd, function (error) {
if (error) return callback(error);
appdb.unsetAddonConfig(app.id, 'postgresql', callback);
@@ -579,7 +579,7 @@ function setupMongoDb(app, options, callback) {
var cmd = [ '/addons/mongodb/service.sh', 'add', app.id ];
docker.execContainer('mongodb', cmd, null /* input */, function (error) {
docker.execContainer('mongodb', cmd, function (error) {
if (error) return callback(error);
appdb.unsetAddonConfig(app.id, 'mongodb', callback);
@@ -595,7 +595,7 @@ function teardownMongoDb(app, options, callback) {
debugApp(app, 'Tearing down mongodb');
docker.execContainer('mongodb', cmd, null /* input */, function (error) {
docker.execContainer('mongodb', cmd, function (error) {
if (error) return callback(error);
appdb.unsetAddonConfig(app.id, 'mongodb', callback);