diff --git a/lib/pip.js b/lib/pip.js index 3f13ee4e..af360918 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -181,6 +181,15 @@ function installRequirements(targetFolder, serverless, options) { pipCmd.push('--cache-dir', 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 = []; @@ -210,7 +219,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', getDockerUid(bindPath));