Merge pull request #61 from sebasmagri/feature-override-docker-cli

feat: add the capability to override the docker cli and arguments

Author: softprops

index.js

@@ -51,14 +51,16 @@ class RustPlugin {
   }
 
   runDocker(funcArgs, cargoPackage, binary, profile) {
-    const cargoHome = process.env.CARGO_HOME || path.join(homedir(), ".cargo");
-    const cargoRegistry = path.join(cargoHome, "registry");
-    const cargoDownloads = path.join(cargoHome, "git");
+    const cargoHome = process.env.CARGO_HOME || path.join(homedir(), '.cargo');
+    const cargoRegistry = path.join(cargoHome, 'registry');
+    const cargoDownloads = path.join(cargoHome, 'git');
+
+    const dockerCLI = process.env['SLS_DOCKER_CLI'] || 'docker';
     const defaultArgs = [
-      "run",
-      "--rm",
-      "-t",
-      "-e",
+      'run',
+      '--rm',
+      '-t',
+      '-e',
       `BIN=${binary}`,
       `-v`,
       `${this.servicePath}:/code`,
@@ -67,12 +69,12 @@ class RustPlugin {
       `-v`,
       `${cargoDownloads}:/root/.cargo/git`
     ];
-    const customArgs = [];
+    const customArgs = (process.env['SLS_DOCKER_ARGS'] || '').split(' ') || [];
 
     let cargoFlags = (funcArgs || {}).cargoFlags || this.custom.cargoFlags;
     if (profile) {
       // release or dev
-      customArgs.push("-e", `PROFILE=${profile}`);
+      customArgs.push('-e', `PROFILE=${profile}`);
     }
     if (cargoPackage != undefined) {
       if (cargoFlags) {
@@ -83,14 +85,21 @@ class RustPlugin {
     }
     if (cargoFlags) {
       // --features awesome-feature, ect
-      customArgs.push("-e", `CARGO_FLAGS=${cargoFlags}`);
+      customArgs.push('-e', `CARGO_FLAGS=${cargoFlags}`);
     }
     const dockerTag = (funcArgs || {}).dockerTag || this.custom.dockerTag;
-    return spawnSync(
-      "docker",
-      [...defaultArgs, ...customArgs, `softprops/lambda-rust:${dockerTag}`],
-      NO_OUTPUT_CAPTURE
+
+    const finalArgs = [
+      ...defaultArgs,
+      ...customArgs,
+      `softprops/lambda-rust:${dockerTag}`
+    ].filter(i => i);
+
+    this.serverless.cli.log(
+      `Running container build with: ${dockerCLI}, args: ${finalArgs}.`
     );
+
+    return spawnSync(dockerCLI, finalArgs, NO_OUTPUT_CAPTURE);
   }
 
   functions() {

tests/test.sh

@@ -33,7 +33,7 @@ for project in  test-func test-func-dev; do
     unzip -o  \
         target/lambda/"${target}"/test-func.zip \
         -d /tmp/lambda > /dev/null 2>&1 && \
-    docker run \
+    ${SLS_DOCKER_CLI:-docker} run \
         -i --rm \
         -e DOCKER_LAMBDA_USE_STDIN=1 \
         -v /tmp/lambda:/var/task \
@@ -63,4 +63,4 @@ for project in  test-func test-func-dev; do
     #    diff test-local.json local-out.log
 done
 
-end_tests
+end_tests