Merge pull request #116 from heri16/patch-3

Fix Windows support for dockerizePip

Author: dschep

lib/pip.js

@@ -1,6 +1,7 @@
 const fse = require('fs-extra');
 const path = require('path');
 const {spawnSync} = require('child_process');
+const isWsl = require('is-wsl');
 
 /**
  * pip install the requirements to the .serverless/requirements directory
@@ -51,29 +52,39 @@ function installRequirements() {
 
     this.serverless.cli.log(`Docker Image: ${this.options.dockerImage}`);
 
-    // Check docker server os type from 'docker version'
-    let volPath;
+    // Determine os platform of docker CLI from 'docker version'
     options = [
-      'version', '--format', '{{with .Server}}{{.Os}}{{end}}'
+      'version', '--format', '{{with .Client}}{{.Os}}{{end}}'
     ];
-    const ps = spawnSync(cmd, options, {'timeout': 2000, 'encoding': 'utf-8'});
+    const ps = spawnSync(cmd, options, {'timeout': 10000, 'encoding': 'utf-8'});
     if (ps.error) {
       if (ps.error.code === 'ENOENT') {
         throw new Error('docker not found! Please install it.');
       }
       throw new Error(ps.error);
-    }
-    if (ps.status !== 0) {
+    } else if (ps.status !== 0) {
       throw new Error(ps.stderr);
-    } else if (ps.stdout.trim() === 'windows') {
-      volPath = this.servicePath.replace(/\\/g, '/').replace(/^\/mnt\//, '/');
+    }
+
+    let bindPath;
+    const cliPlatform = ps.stdout.trim();
+    if (process.platform === 'win32') {
+      bindPath = this.servicePath.replace(/\\([^\s])/g, '/$1');
+      if (cliPlatform === 'windows') {
+        bindPath = bindPath.replace(/^\/(\w)\//i, '$1:/');
+      }
+    } else if (isWsl) {
+      bindPath = this.servicePath.replace(/^\/mnt\//, '/');
+      if (cliPlatform === 'windows') {
+        bindPath = bindPath.replace(/^\/(\w)\//i, '$1:/');
+      }
     } else {
-      volPath = this.servicePath;
+      bindPath = this.servicePath;
     }
 
     options = [
       'run', '--rm',
-      '-v', `${volPath}:/var/task:z`,
+      '-v', `${bindPath}:/var/task:z`,
     ];
     if (process.platform === 'linux')
       options.push('-u', `${process.getuid()}:${process.getgid()}`);

package.json

@@ -51,6 +51,7 @@
     "fs-extra": "^3.0.1",
     "glob-all": "^3.1.0",
     "graceful-fs": "^4.1.11",
+    "is-wsl": "^1.1.0",
     "lodash": "^4.13.1"
   }
 }