@go-to-k/cdkd 0.69.0 → 0.70.0

package/dist/index.js

@@ -2486,14 +2486,57 @@ var FileAssetPublisher = class {
 };
 
 // src/assets/docker-asset-publisher.ts
-import { execFile, spawn as spawn2 } from "node:child_process";
-import { promisify } from "node:util";
+import { execFile as execFile2, spawn as spawn2 } from "node:child_process";
+import { promisify as promisify2 } from "node:util";
 import {
   ECRClient,
   GetAuthorizationTokenCommand,
   DescribeImagesCommand as DescribeImagesCommand2
 } from "@aws-sdk/client-ecr";
+
+// src/assets/docker-build.ts
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
+async function buildDockerImage(asset, cdkOutDir, tag, options) {
+  const logger = getLogger().child("docker-build");
+  const args = ["build", "-t", tag];
+  if (options.platform) {
+    args.push("--platform", options.platform);
+  }
+  if (asset.source.dockerFile) {
+    args.push("-f", asset.source.dockerFile);
+  }
+  if (asset.source.dockerBuildArgs) {
+    for (const [key, value] of Object.entries(asset.source.dockerBuildArgs)) {
+      args.push("--build-arg", `${key}=${value}`);
+    }
+  }
+  if (asset.source.dockerBuildTarget) {
+    args.push("--target", asset.source.dockerBuildTarget);
+  }
+  if (asset.source.dockerOutputs) {
+    for (const output of asset.source.dockerOutputs) {
+      args.push("--output", output);
+    }
+  }
+  const contextDir = `${cdkOutDir}/${asset.source.directory}`;
+  args.push(contextDir);
+  logger.debug(`docker ${args.join(" ")}`);
+  try {
+    await execFileAsync("docker", args, {
+      maxBuffer: 50 * 1024 * 1024
+      // 50MB for build output
+    });
+  } catch (error) {
+    const err = error;
+    const stderr = err.stderr || err.message || String(error);
+    throw options.wrapError(stderr);
+  }
+}
+
+// src/assets/docker-asset-publisher.ts
+var execFileAsync2 = promisify2(execFile2);
 var DockerAssetPublisher = class {
   logger = getLogger().child("DockerAssetPublisher");
   /**
@@ -2576,38 +2619,17 @@ var DockerAssetPublisher = class {
     }
   }
   /**
-   * Build Docker image
+   * Build Docker image — delegates to the shared `buildDockerImage`
+   * helper so this code path stays in sync with `cdkd local invoke`'s
+   * container-Lambda build path. `--platform` is currently not threaded
+   * through here (publish-assets has no Architectures hint to consult);
+   * a follow-up can lift this once the asset manifest carries a
+   * platform field.
    */
   async buildImage(asset, cdkOutputDir, tag) {
-    const args = ["build", "-t", tag];
-    if (asset.source.dockerFile) {
-      args.push("-f", asset.source.dockerFile);
-    }
-    if (asset.source.dockerBuildArgs) {
-      for (const [key, value] of Object.entries(asset.source.dockerBuildArgs)) {
-        args.push("--build-arg", `${key}=${value}`);
-      }
-    }
-    if (asset.source.dockerBuildTarget) {
-      args.push("--target", asset.source.dockerBuildTarget);
-    }
-    if (asset.source.dockerOutputs) {
-      for (const output of asset.source.dockerOutputs) {
-        args.push("--output", output);
-      }
-    }
-    const contextDir = `${cdkOutputDir}/${asset.source.directory}`;
-    args.push(contextDir);
-    this.logger.debug(`docker ${args.join(" ")}`);
-    try {
-      await execFileAsync("docker", args, {
-        maxBuffer: 50 * 1024 * 1024
-        // 50MB for build output
-      });
-    } catch (error) {
-      const err = error;
-      throw new AssetError(`Docker build failed: ${err.stderr || err.message || String(error)}`);
-    }
+    await buildDockerImage(asset, cdkOutputDir, tag, {
+      wrapError: (stderr) => new AssetError(`Docker build failed: ${stderr}`)
+    });
   }
   /**
    * Authenticate with ECR
@@ -2651,7 +2673,7 @@ var DockerAssetPublisher = class {
    * Tag Docker image
    */
   async tagImage(source, target) {
-    await execFileAsync("docker", ["tag", source, target]);
+    await execFileAsync2("docker", ["tag", source, target]);
   }
   /**
    * Push Docker image
@@ -2659,7 +2681,7 @@ var DockerAssetPublisher = class {
   async pushImage(uri) {
     this.logger.debug(`Pushing: ${uri}`);
     try {
-      await execFileAsync("docker", ["push", uri], {
+      await execFileAsync2("docker", ["push", uri], {
         maxBuffer: 50 * 1024 * 1024
       });
     } catch (error) {