From 97f378c52eff037a6185106941c1411a08c6f905 Mon Sep 17 00:00:00 2001 From: Paul Vecchio Date: Sun, 16 Sep 2018 18:06:54 -0700 Subject: [PATCH 1/5] fix broken windows path --- lib/pip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index d5017e28..19d3cff0 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -147,7 +147,7 @@ function installRequirements(targetFolder, serverless, options) { serverless.cli.log(`Docker Image: ${dockerImage}`); // Prepare bind path depending on os platform - const bindPath = getBindPath(serverless, targetFolder); + const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder)); cmdOptions = ['run', '--rm', '-v', quote_single(`${bindPath}:/var/task:z`)]; if (options.dockerSsh) { From ff29e77170529642ece037dac48ba7167da55108 Mon Sep 17 00:00:00 2001 From: Paul Vecchio Date: Sun, 16 Sep 2018 18:09:20 -0700 Subject: [PATCH 2/5] remove quote_single as it is done in dockerPathForWin --- lib/pip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index 19d3cff0..602130e5 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -149,7 +149,7 @@ function installRequirements(targetFolder, serverless, options) { // Prepare bind path depending on os platform const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder)); - cmdOptions = ['run', '--rm', '-v', quote_single(`${bindPath}:/var/task:z`)]; + cmdOptions = ['run', '--rm', '-v', `${bindPath}:/var/task:z`]; if (options.dockerSsh) { // Mount necessary ssh files to work with private repos cmdOptions.push( From c9c04e7714f9c6c41bacd1d417e2430547926ebf Mon Sep 17 00:00:00 2001 From: Paul Vecchio Date: Sun, 16 Sep 2018 18:15:20 -0700 Subject: [PATCH 3/5] forgot to pass options --- lib/pip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index 602130e5..ea55879a 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -147,7 +147,7 @@ function installRequirements(targetFolder, serverless, options) { serverless.cli.log(`Docker Image: ${dockerImage}`); // Prepare bind path depending on os platform - const bindPath = dockerPathForWin(getBindPath(serverless, targetFolder)); + const bindPath = dockerPathForWin(options, getBindPath(serverless, targetFolder)); cmdOptions = ['run', '--rm', '-v', `${bindPath}:/var/task:z`]; if (options.dockerSsh) { From 63b2195608fda7bd1001111c75f4e499b1f9269f Mon Sep 17 00:00:00 2001 From: Paul Vecchio Date: Sun, 16 Sep 2018 21:06:37 -0700 Subject: [PATCH 4/5] shorten line --- lib/pip.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index ea55879a..8d783df6 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -147,7 +147,9 @@ function installRequirements(targetFolder, serverless, options) { serverless.cli.log(`Docker Image: ${dockerImage}`); // Prepare bind path depending on os platform - const bindPath = dockerPathForWin(options, getBindPath(serverless, targetFolder)); + const bindPath = dockerPathForWin( + options, getBindPath(serverless, targetFolder) + ); cmdOptions = ['run', '--rm', '-v', `${bindPath}:/var/task:z`]; if (options.dockerSsh) { From 9bb541212c17b39d21952af4d710e02149a3a37d Mon Sep 17 00:00:00 2001 From: Paul Vecchio Date: Mon, 17 Sep 2018 10:28:30 -0700 Subject: [PATCH 5/5] yarn format --- lib/pip.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pip.js b/lib/pip.js index 8d783df6..a80135ce 100644 --- a/lib/pip.js +++ b/lib/pip.js @@ -148,7 +148,8 @@ function installRequirements(targetFolder, serverless, options) { // Prepare bind path depending on os platform const bindPath = dockerPathForWin( - options, getBindPath(serverless, targetFolder) + options, + getBindPath(serverless, targetFolder) ); cmdOptions = ['run', '--rm', '-v', `${bindPath}:/var/task:z`];