verdnatura-mirror
/
loopback-boot
mirror of https://github.com/strongloop/loopback-boot.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from strongloop/feature/bluemix-env 

Support bluemix environment variables for host and port
This commit is contained in:
Miroslav Bajtoš 2015-10-14 11:18:45 +02:00
parent 63589c03ab c8fdbd5110
commit 5238bc1027
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/executor.js
View File

@ -93,6 +93,7 @@ function setHost(app, instructions) {
process.env.npm_config_host || process.env.npm_config_host ||
process.env.OPENSHIFT_SLS_IP || process.env.OPENSHIFT_SLS_IP ||
process.env.OPENSHIFT_NODEJS_IP || process.env.OPENSHIFT_NODEJS_IP ||
process.env.VCAP_APP_HOST ||
process.env.HOST || process.env.HOST ||
instructions.config.host || instructions.config.host ||
process.env.npm_package_config_host || process.env.npm_package_config_host ||
@ -110,6 +111,7 @@ function setPort(app, instructions) {
process.env.npm_config_port, process.env.npm_config_port,
process.env.OPENSHIFT_SLS_PORT, process.env.OPENSHIFT_SLS_PORT,
process.env.OPENSHIFT_NODEJS_PORT, process.env.OPENSHIFT_NODEJS_PORT,
process.env.VCAP_APP_PORT,
process.env.PORT, process.env.PORT,
instructions.config.port, instructions.config.port,
process.env.npm_package_config_port, process.env.npm_package_config_port,

5
test/executor.test.js
View File

@ -340,12 +340,14 @@ describe('executor', function() {
delete process.env.npm_config_host; delete process.env.npm_config_host;
delete process.env.OPENSHIFT_SLS_IP; delete process.env.OPENSHIFT_SLS_IP;
delete process.env.OPENSHIFT_NODEJS_IP; delete process.env.OPENSHIFT_NODEJS_IP;
delete process.env.VCAP_APP_HOST;
delete process.env.HOST; delete process.env.HOST;
delete process.env.npm_package_config_host; delete process.env.npm_package_config_host;
delete process.env.npm_config_port; delete process.env.npm_config_port;
delete process.env.OPENSHIFT_SLS_PORT; delete process.env.OPENSHIFT_SLS_PORT;
delete process.env.OPENSHIFT_NODEJS_PORT; delete process.env.OPENSHIFT_NODEJS_PORT;
delete process.env.VCAP_APP_PORT;
delete process.env.PORT; delete process.env.PORT;
delete process.env.npm_package_config_port; delete process.env.npm_package_config_port;
}); });
@ -375,6 +377,7 @@ describe('executor', function() {
assertHonored('npm_config_port', 'npm_config_host'); assertHonored('npm_config_port', 'npm_config_host');
assertHonored('npm_package_config_port', 'npm_package_config_host'); assertHonored('npm_package_config_port', 'npm_package_config_host');
assertHonored('OPENSHIFT_SLS_PORT', 'OPENSHIFT_SLS_IP'); assertHonored('OPENSHIFT_SLS_PORT', 'OPENSHIFT_SLS_IP');
assertHonored('VCAP_APP_PORT', 'VCAP_APP_HOST');
assertHonored('PORT', 'HOST'); assertHonored('PORT', 'HOST');
}); });
@ -383,6 +386,7 @@ describe('executor', function() {
process.env.npm_config_host = randomHost(); process.env.npm_config_host = randomHost();
process.env.OPENSHIFT_SLS_IP = randomHost(); process.env.OPENSHIFT_SLS_IP = randomHost();
process.env.OPENSHIFT_NODEJS_IP = randomHost(); process.env.OPENSHIFT_NODEJS_IP = randomHost();
process.env.VCAP_APP_HOST = randomHost();
process.env.HOST = randomHost(); process.env.HOST = randomHost();
process.env.npm_package_config_host = randomHost(); process.env.npm_package_config_host = randomHost();
@ -394,6 +398,7 @@ describe('executor', function() {
process.env.npm_config_port = randomPort(); process.env.npm_config_port = randomPort();
process.env.OPENSHIFT_SLS_PORT = randomPort(); process.env.OPENSHIFT_SLS_PORT = randomPort();
process.env.OPENSHIFT_NODEJS_PORT = randomPort(); process.env.OPENSHIFT_NODEJS_PORT = randomPort();
process.env.VCAP_APP_PORT = randomPort();
process.env.PORT = randomPort(); process.env.PORT = randomPort();
process.env.npm_package_config_port = randomPort(); process.env.npm_package_config_port = randomPort();