feat(core): allow asset bundling on docker remote host / docker in docker

packages/@aws-cdk/aws-lambda-go/lib/bundling.ts

@@ -2,6 +2,7 @@ import * as os from 'os';
 import * as path from 'path';
 import { Architecture, AssetCode, Code, Runtime } from '@aws-cdk/aws-lambda';
 import * as cdk from '@aws-cdk/core';
+import { BundlingFileCopyVariant } from '@aws-cdk/core';
 import { BundlingOptions } from './types';
 import { exec, findUp, getGoBuildVersion } from './util';
 
@@ -60,6 +61,12 @@ export interface BundlingProps extends BundlingOptions {
    * The system architecture of the lambda function
    */
   readonly architecture: Architecture;
+
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  readonly fileCopyVariant?: BundlingFileCopyVariant;
 }
 
 /**
@@ -85,6 +92,7 @@ export class Bundling implements cdk.BundlingOptions {
         user: bundling.user,
         securityOpt: bundling.securityOpt,
         network: bundling.network,
+        fileCopyVariant: bundling.fileCopyVariant,
       },
     });
   }
@@ -107,6 +115,7 @@ export class Bundling implements cdk.BundlingOptions {
   public readonly user?: string;
   public readonly securityOpt?: string;
   public readonly network?: string;
+  public readonly fileCopyVariant?: cdk.BundlingFileCopyVariant;
 
   private readonly relativeEntryPath: string;
 
@@ -154,6 +163,7 @@ export class Bundling implements cdk.BundlingOptions {
     this.user = props.user;
     this.securityOpt = props.securityOpt;
     this.network = props.network;
+    this.fileCopyVariant = props.fileCopyVariant;
 
     // Local bundling
     if (!props.forcedDockerBundling) { // only if Docker is not forced

packages/@aws-cdk/aws-lambda-go/lib/types.ts

@@ -1,4 +1,4 @@
-import { AssetHashType, DockerImage, DockerRunOptions } from '@aws-cdk/core';
+import { AssetHashType, BundlingFileCopyVariant, DockerImage, DockerRunOptions } from '@aws-cdk/core';
 
 /**
  * Bundling options
@@ -111,6 +111,12 @@ export interface BundlingOptions extends DockerRunOptions {
    * @default - Direct access
    */
   readonly goProxies?: string[];
+
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  readonly fileCopyVariant?: BundlingFileCopyVariant;
 }
 
 /**

packages/@aws-cdk/aws-lambda-go/test/bundling.test.ts

@@ -2,7 +2,7 @@ import * as child_process from 'child_process';
 import * as os from 'os';
 import * as path from 'path';
 import { Architecture, Code, Runtime } from '@aws-cdk/aws-lambda';
-import { AssetHashType, DockerImage } from '@aws-cdk/core';
+import { AssetHashType, BundlingFileCopyVariant, DockerImage } from '@aws-cdk/core';
 import { Bundling } from '../lib/bundling';
 import * as util from '../lib/util';
 
@@ -461,3 +461,21 @@ test('Custom bundling network', () => {
     }),
   });
 });
+
+test('Custom bundling file copy variant', () => {
+  Bundling.bundle({
+    entry,
+    moduleDir,
+    runtime: Runtime.GO_1_X,
+    architecture: Architecture.X86_64,
+    forcedDockerBundling: true,
+    fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+  });
+
+  expect(Code.fromAsset).toHaveBeenCalledWith('/project', {
+    assetHashType: AssetHashType.OUTPUT,
+    bundling: expect.objectContaining({
+      fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+    }),
+  });
+});

packages/@aws-cdk/aws-lambda-nodejs/lib/bundling.ts

@@ -6,6 +6,7 @@ import { PackageInstallation } from './package-installation';
 import { LockFile, PackageManager } from './package-manager';
 import { BundlingOptions, OutputFormat, SourceMapMode } from './types';
 import { exec, extractDependencies, findUp, getTsconfigCompilerOptions } from './util';
+import { BundlingFileCopyVariant } from '@aws-cdk/core';
 
 const ESBUILD_MAJOR_VERSION = '0';
 
@@ -43,6 +44,12 @@ export interface BundlingProps extends BundlingOptions {
    */
   readonly preCompilation?: boolean
 
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  readonly fileCopyVariant?: BundlingFileCopyVariant;
+
 }
 
 /**
@@ -83,6 +90,7 @@ export class Bundling implements cdk.BundlingOptions {
   public readonly securityOpt?: string;
   public readonly network?: string;
   public readonly local?: cdk.ILocalBundling;
+  public readonly fileCopyVariant?: cdk.BundlingFileCopyVariant;
 
   private readonly projectRoot: string;
   private readonly relativeEntryPath: string;
@@ -154,6 +162,7 @@ export class Bundling implements cdk.BundlingOptions {
     this.user = props.user;
     this.securityOpt = props.securityOpt;
     this.network = props.network;
+    this.fileCopyVariant = props.fileCopyVariant;
 
     // Local bundling
     if (!props.forceDockerBundling) { // only if Docker is not forced

packages/@aws-cdk/aws-lambda-nodejs/lib/types.ts

@@ -1,4 +1,4 @@
-import { DockerImage, DockerRunOptions } from '@aws-cdk/core';
+import { BundlingFileCopyVariant, DockerImage, DockerRunOptions } from '@aws-cdk/core';
 
 /**
  * Bundling options
@@ -301,6 +301,12 @@ export interface BundlingOptions extends DockerRunOptions {
    * @default - no code is injected
    */
   readonly inject?: string[]
+
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  readonly fileCopyVariant?: BundlingFileCopyVariant;
 }
 
 /**

packages/@aws-cdk/aws-lambda-nodejs/test/bundling.test.ts

@@ -2,7 +2,7 @@ import * as child_process from 'child_process';
 import * as os from 'os';
 import * as path from 'path';
 import { Architecture, Code, Runtime } from '@aws-cdk/aws-lambda';
-import { AssetHashType, DockerImage } from '@aws-cdk/core';
+import { AssetHashType, BundlingFileCopyVariant, DockerImage } from '@aws-cdk/core';
 import { version as delayVersion } from 'delay/package.json';
 import { Bundling } from '../lib/bundling';
 import { PackageInstallation } from '../lib/package-installation';
@@ -802,3 +802,22 @@ test('Custom bundling network', () => {
     }),
   });
 });
+
+test('Custom bundling file copy variant', () => {
+  Bundling.bundle({
+    entry,
+    projectRoot,
+    depsLockFilePath,
+    runtime: Runtime.NODEJS_14_X,
+    architecture: Architecture.X86_64,
+    forceDockerBundling: true,
+    fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+  });
+
+  expect(Code.fromAsset).toHaveBeenCalledWith('/project', {
+    assetHashType: AssetHashType.OUTPUT,
+    bundling: expect.objectContaining({
+      fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+    }),
+  });
+});

packages/@aws-cdk/aws-lambda-python/lib/bundling.ts

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import { Architecture, AssetCode, Code, Runtime } from '@aws-cdk/aws-lambda';
-import { AssetStaging, BundlingOptions as CdkBundlingOptions, DockerImage, DockerVolume } from '@aws-cdk/core';
+import { AssetStaging, BundlingFileCopyVariant, BundlingOptions as CdkBundlingOptions, DockerImage, DockerVolume } from '@aws-cdk/core';
 import { Packaging, DependenciesFile } from './packaging';
 import { BundlingOptions, ICommandHooks } from './types';
 
@@ -41,6 +41,12 @@ export interface BundlingProps extends BundlingOptions {
    * @default - Does not skip bundling
    */
   readonly skip?: boolean;
+
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  fileCopyVariant?: BundlingFileCopyVariant
 }
 
 /**
@@ -66,6 +72,7 @@ export class Bundling implements CdkBundlingOptions {
   public readonly user?: string;
   public readonly securityOpt?: string;
   public readonly network?: string;
+  public readonly fileCopyVariant?: BundlingFileCopyVariant;
 
   constructor(props: BundlingProps) {
     const {
@@ -104,6 +111,7 @@ export class Bundling implements CdkBundlingOptions {
     this.user = props.user;
     this.securityOpt = props.securityOpt;
     this.network = props.network;
+    this.fileCopyVariant = props.fileCopyVariant;
   }
 
   private createBundlingCommand(options: BundlingCommandOptions): string[] {

packages/@aws-cdk/aws-lambda-python/lib/types.ts

@@ -1,4 +1,4 @@
-import { AssetHashType, DockerImage, DockerRunOptions } from '@aws-cdk/core';
+import { AssetHashType, BundlingFileCopyVariant, DockerImage, DockerRunOptions } from '@aws-cdk/core';
 
 
 /**
@@ -86,6 +86,12 @@ export interface BundlingOptions extends DockerRunOptions {
    * @default - do not run additional commands
    */
   readonly commandHooks?: ICommandHooks;
+
+  /**
+   * Which option to use to copy the source files to the docker container and output files back
+   * @default - BIND_MOUNT
+   */
+  readonly fileCopyVariant?: BundlingFileCopyVariant;
 }
 
 /**

packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { Architecture, Code, Runtime } from '@aws-cdk/aws-lambda';
-import { DockerImage } from '@aws-cdk/core';
+import { BundlingFileCopyVariant, DockerImage } from '@aws-cdk/core';
 import { Bundling } from '../lib/bundling';
 
 jest.spyOn(Code, 'fromAsset');
@@ -374,6 +374,22 @@ test('Bundling with custom network', () => {
   }));
 });
 
+test('Bundling with docker copy variant', () => {
+  const entry = path.join(__dirname, 'lambda-handler');
+  Bundling.bundle({
+    entry: entry,
+    runtime: Runtime.PYTHON_3_7,
+    fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+
+  });
+
+  expect(Code.fromAsset).toHaveBeenCalledWith(entry, expect.objectContaining({
+    bundling: expect.objectContaining({
+      fileCopyVariant: BundlingFileCopyVariant.DOCKER_COPY,
+    }),
+  }));
+});
+
 test('Do not build docker image when skipping bundling', () => {
   const entry = path.join(__dirname, 'lambda-handler');
   Bundling.bundle({