Merge remote-tracking branch 'galindro/master' into env

Author: dschep

lib/pip.js

@@ -196,6 +196,15 @@ function installRequirements(targetFolder, serverless, options) {
       pipCmd.push('--cache-dir', quote_single(dockerDownloadCacheDir));
     }
 
+    if (options.dockerEnv) {
+      // Add environment variables to docker run cmd
+      options.dockerEnv.forEach(
+          function(item) {
+            cmdOptions.push('-e', item);
+          }
+      );
+    }
+
     if (process.platform === 'linux') {
       // Use same user so requirements folder is not root and so --cache-dir works
       var commands = [];
@@ -225,7 +234,7 @@ function installRequirements(targetFolder, serverless, options) {
           ])
         );
       }
-      pipCmd = ['/bin/bash', '-c', '"' + commands.join(' && ') + '"'];
+      pipCmd = ['/bin/bash', '-c', '"' + commands.join(' ; ') + '"'];
     } else {
       // Use same user so --cache-dir works
       cmdOptions.push('-u', quote_single(getDockerUid(bindPath)));