#231: Better linux host IP discovery

lando · Aug 2, 2017 · 5d9b1e3 · 5d9b1e3
1 parent d63bb51
commit 5d9b1e3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/lib/engine.js b/lib/engine.js
@@ -63,14 +63,8 @@ lando.events.on('pre-bootstrap', 1, function(config) {
   var rip = '192.168.65.1';
 
   // If on linux we are dealing with something else
-  // @TODO: this might need some love
   if (process.platform === 'linux') {
-    var os = require('os');
-    var nics = os.networkInterfaces();
-    var lo = '127.0.0.1';
-    var ip = _.dropRight(_.get(nics, 'eth0[0].address', lo).split('.'));
-    ip.push('1');
-    rip = ip.join('.');
+    rip = lando.node.ip.address();
   }
 
   // Set some helpful engine env helpers

diff --git a/lib/node.js b/lib/node.js
@@ -52,6 +52,17 @@ exports.chalk = require('yargonaut').chalk();
  */
 exports.fs = require('fs-extra');
 
+/**
+ * Get ip utils
+ *
+ * @since 3.0.0
+ * @example
+ *
+ * // Get the ip module
+ * var ip = lando.node.ip;
+ */
+exports.ip = require('ip');
+
 /**
  * Get object-hash
  *

diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
     "fs-extra": "^0.18.2",
     "github": "^9.2.0",
     "inquirer": "^3.1.1",
+    "ip": "^1.1.5",
     "js-yaml": "^3.4.6",
     "jsonfile": "^2.4.0",
     "kalabox-stats-client": "^0.2.1",

diff --git a/plugins/lando-proxy/lib/proxy.js b/plugins/lando-proxy/lib/proxy.js
@@ -197,8 +197,8 @@ module.exports = function(lando) {
       var https = ports.https;
 
       // Log
-      lando.log.verbose('Proxying on %s:%s', engineHost, http);
-      lando.log.verbose('Proxying on %s:%s', engineHost, https);
+      lando.log.verbose('Proxying on %s:%s', http);
+      lando.log.verbose('Proxying on %s:%s', https);
 
       // Proxy service
       var proxy = {
@@ -213,8 +213,8 @@ module.exports = function(lando) {
         },
         networks: ['edge'],
         ports: [
-          [engineHost, http, '80'].join(':'),
-          [engineHost, https, '443'].join(':'),
+          [http, '80'].join(':'),
+          [https, '443'].join(':'),
           [proxyDash, 8080].join(':')
         ],
         volumes: [