Add support for remote DOCKER_HOST

README.md

@@ -72,6 +72,23 @@ It is important that the host of your private repositories has already been adde
 `$HOME/.ssh/known_hosts` file, as the install process will fail otherwise due to host authenticity
 failure.
 
+### Remote docker hosts
+
+If you have DOCKER_HOST set to a remote mahine, you must set the following option. This tells the plugin
+not to try and mount the local filesystem to the container (which will not work over a network). Instead
+it uses a Docker volume and copies the files across.
+
+Additionally, if you are in a corporate network and there is a proxy, you can define this in the `proxy` option. 
+This will set the http and https proxy inside the container.
+
+```yaml 
+custom:
+  pythonRequirements:
+    dockerizePip: true
+    dockerRemoteHost: true
+    proxy: http://yourproxy:8080
+```
+
 [:checkered_flag: Windows notes](#checkered_flag-windows-dockerizepip-notes)
 
 ## Pipenv support :sparkles::cake::sparkles:

lib/pip.js

@@ -146,13 +146,71 @@ 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)
-    );
+    var bindPath = ''; // Set this depending on whether remote host is being used.
+
+    // If Docker is using a remote host, we can't mount local files. Need to use data volume instead, and copy files in.
+    if (options.dockerRemoteHost) {
+      // docker volume create data-volume
+      serverless.cli.log('Remote docker option selected');
+      serverless.cli.log('Creating data volume');
+      cmdOptions = ['volume', 'create', 'data-volume']; // volume create data-volume
+      executeCmdAsSpawnSync(cmd, cmdOptions, options);
+
+      // docker create -v data-volume:/var/task --name helper (imagename) true
+      serverless.cli.log('Mounting data volume to helper container');
+      cmdOptions = [
+        'create',
+        '-v',
+        'data-volume:/var/task',
+        '--name',
+        'helper',
+        dockerImage,
+        'true'
+      ];
+      executeCmdAsSpawnSync(cmd, cmdOptions, options);
+
+      // copy the files onto the volume
+      serverless.cli.log('Copying files onto volume');
+      cmdOptions = [
+        'cp',
+        dockerPathForWin(options, targetFolder),
+        'helper:/var/task'
+      ]; // volume create data-volume
+      executeCmdAsSpawnSync(cmd, cmdOptions, options);
+
+      // remove the helper container - not needed any more
+      serverless.cli.log('Removing helper image');
+      cmdOptions = ['rm', 'helper']; // volume create data-volume
+      executeCmdAsSpawnSync(cmd, cmdOptions, options);
+
+      // Now set bindPath to the data volume (rather than a local folder)
+      bindPath = 'data-volume';
+      cmdOptions = [];
+    } else {
+      // Prepare bind path depending on os platform
+      bindPath = dockerPathForWin(
+        options,
+        getBindPath(serverless, targetFolder)
+      );
+    }
+
+    cmdOptions = [
+      'run',
+      '--name',
+      'python-reqs',
+      '-v',
+      `${bindPath}:/var/task:z`
+    ];
+
+    if (options.proxy) {
+      cmdOptions.push(
+        '--env',
+        `http_proxy=${options.proxy}`,
+        '--env',
+        `https_proxy=${options.proxy}`
+      );
+    }
 
-    cmdOptions = ['run', '--rm', '-v', `${bindPath}:/var/task:z`];
     if (options.dockerSsh) {
       // Mount necessary ssh files to work with private repos
       cmdOptions.push(
@@ -242,6 +300,37 @@ function installRequirements(targetFolder, serverless, options) {
     const preparedPath = dockerPathForWin(options, targetFolder);
     cmdOptions.push(getStripCommand(options, preparedPath));
   }
+
+  try {
+    // execute the pip install (inside the container
+    executeCmdAsSpawnSync(cmd, cmdOptions, options);
+
+    if (options.dockerizePip) {
+      if (options.dockerRemoteHost) {
+        // copy the files back from the data volume
+        serverless.cli.log(
+          'Copying python libraries off docker container, ready for zipping'
+        );
+        cmdOptions = ['cp', 'python-reqs:/var/task/.', targetFolder]; // volume create data-volume
+        executeCmdAsSpawnSync(cmd, cmdOptions, options);
+      }
+    }
+  } finally {
+    if (options.dockerizePip) {
+      // clean up for next time.
+      serverless.cli.log('Removing container image');
+      cmdOptions = ['rm', 'python-reqs']; // remove data-volume
+      executeCmdAsSpawnSync(cmd, cmdOptions, options);
+    }
+  }
+
+  // If enabled slimming, delete files in slimPatterns
+  if (options.slim === true || options.slim === 'true') {
+    deleteFiles(options, targetFolder);
+  }
+}
+
+function executeCmdAsSpawnSync(cmd, cmdOptions, options) {
   let spawnArgs = { shell: true };
   if (process.env.SLS_DEBUG) {
     spawnArgs.stdio = 'inherit';
@@ -261,10 +350,6 @@ function installRequirements(targetFolder, serverless, options) {
   if (res.status !== 0) {
     throw new Error(res.stderr);
   }
-  // If enabled slimming, delete files in slimPatterns
-  if (options.slim === true || options.slim === 'true') {
-    deleteFiles(options, targetFolder);
-  }
 }
 
 /**
@@ -274,10 +359,8 @@ function installRequirements(targetFolder, serverless, options) {
  * @return {string}
  */
 function dockerPathForWin(options, path) {
-  if (process.platform === 'win32') {
-    return `"${path.replace(/\\/g, '/')}"`;
-  } else if (process.platform === 'win32' && !options.dockerizePip) {
-    return path;
+  if (process.platform === 'win32' && options.dockerizePip) {
+    return path.replace(/\\/g, '/');
   }
   return quote_single(path);
 }