create-svc 0.1.40 → 0.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.40",
+  "version": "0.1.41",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/service-runtime/cloudrun/deploy-args.ts

@@ -6,6 +6,12 @@ export type DeployArgs = {
   name?: string;
 };
 
+export const CLOUD_RUN_LOCAL_BUILD_PLATFORM = "linux/amd64";
+
+export function localDockerBuildArgs(image: string) {
+  return ["build", "--platform", CLOUD_RUN_LOCAL_BUILD_PLATFORM, "-t", image, "."];
+}
+
 export function parseDeployArgs(argv: string[]): DeployArgs {
   const parsed: DeployArgs = {
     build: parseBuildStrategy(process.env.SERVICE_BUILD_STRATEGY || process.env.SERVICE_BUILD),
@@ -87,4 +93,3 @@ function parseBuildStrategy(value: string | undefined): DeployArgs["build"] {
   }
   throw new Error(`Unknown build strategy: ${value}`);
 }
-

package/src/service-runtime/cloudrun/deploy.ts

@@ -12,6 +12,7 @@ import {
   gcloudStreaming,
   gcloudWithRetry,
   imageUrl,
+  localDockerBuildArgs,
   parseDeployArgs,
   requireCommand,
   resolveDeploymentTarget,
@@ -84,7 +85,7 @@ export async function deploy(args = Bun.argv.slice(2), deployOptions: DeployOpti
     await runStep("Authenticating Docker to Artifact Registry", () =>
       gcloud(["auth", "configure-docker", `${config.region}-docker.pkg.dev`, "--quiet"])
     );
-    await runStep("Building container image locally", () => dockerStreaming(["build", "-t", image, "."]));
+    await runStep("Building container image locally", () => dockerStreaming(localDockerBuildArgs(image)));
     await runStep("Pushing container image to Artifact Registry", () => dockerStreaming(["push", image]));
   }
 

package/src/service-runtime/cloudrun/lib.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, expect, test } from "bun:test";
-import { parseDeployArgs } from "./deploy-args";
+import { localDockerBuildArgs, parseDeployArgs } from "./deploy-args";
 
 const originalBuild = process.env.SERVICE_BUILD;
 const originalBuildStrategy = process.env.SERVICE_BUILD_STRATEGY;
@@ -27,3 +27,14 @@ test("parseDeployArgs accepts build strategy from env", () => {
 
   expect(parseDeployArgs([]).build).toBe("cloudbuild");
 });
+
+test("local Docker builds target Cloud Run's runtime platform", () => {
+  expect(localDockerBuildArgs("us-west1-docker.pkg.dev/example/services/api:latest")).toEqual([
+    "build",
+    "--platform",
+    "linux/amd64",
+    "-t",
+    "us-west1-docker.pkg.dev/example/services/api:latest",
+    ".",
+  ]);
+});

package/src/service-runtime/cloudrun/lib.ts

@@ -2,7 +2,7 @@ import { intro, log, outro, spinner } from "@clack/prompts";
 import { join } from "node:path";
 import { config } from "./config";
 import { serviceRoot } from "../runtime";
-import { parseDeployArgs, type DeployArgs } from "./deploy-args";
+import { localDockerBuildArgs, parseDeployArgs, type DeployArgs } from "./deploy-args";
 
 type CommandOptions = {
   allowFailure?: boolean;
@@ -452,7 +452,7 @@ export function imageUrl(tag = imageTag()) {
   return `${artifactImageBase()}:${tag}`;
 }
 
-export { parseDeployArgs };
+export { localDockerBuildArgs, parseDeployArgs };
 
 export function parseCleanupArgs(argv: string[]): CleanupArgs {
   const parsed: CleanupArgs = {

package/templates/shared/README.md

@@ -74,6 +74,8 @@ Local provisioning intentionally prefers known-good CLIs over SDKs for Google Cl
 Cloud Run deploys build and push the container image locally by default. Use
 `service deploy --build cloudbuild` only when you explicitly want Google Cloud
 Build to build the image remotely.
+Local Docker builds target `linux/amd64` so images built on Apple Silicon run on
+Cloud Run.
 
 Authenticate `gcloud` on the machine before running provisioning commands: