[deploy-helpers] Containers support for Worker Preview deployments in the Build Output (#15822)

Co-authored-by: Pete Bacon Darwin <pbacondarwin@cloudflare.com>

Author: GregBrimble

.changeset/live-durable-object-exports.md

@@ -0,0 +1,7 @@
+---
+"@cloudflare/workers-utils": minor
+---
+
+Expose a helper for identifying live Durable Object exports
+
+Use `isLiveDurableObjectExport()` to distinguish created and incoming-transfer exports from deleted, renamed, and transferred tombstones.

.changeset/orange-previews-containers.md

@@ -0,0 +1,6 @@
+---
+"@cloudflare/deploy-helpers": minor
+"wrangler": minor
+---
+
+Support Containers in Worker Preview deployments with the Build Output.

packages/containers-shared/src/build.ts

@@ -282,7 +282,7 @@ export async function pushImageIfChanged({
 	pathToDocker: string;
 	sourceTag: string;
 	targetTag: string;
-	containerConfig?: DockerfileContainerConfig;
+	containerConfig?: ContainerNormalizedConfig;
 	accountId?: string;
 	complianceConfig?: ComplianceConfig;
 	cleanupSourceTag?: boolean;
@@ -353,11 +353,12 @@ export async function pushImageIfChanged({
 
 		if (parsedRemoteManifest.Descriptor.digest === hash) {
 			logger.log("Image already exists remotely, skipping push");
-			logger.debug(
-				`Untagging built image: ${sourceTag} since there was no change.`
-			);
-
-			await runDockerCmd(pathToDocker, ["image", "rm", sourceTag]);
+			if (cleanupSourceTag !== false) {
+				logger.debug(
+					`Untagging built image: ${sourceTag} since there was no change.`
+				);
+				await runDockerCmd(pathToDocker, ["image", "rm", sourceTag]);
+			}
 
 			return { remoteDigest };
 		}

packages/containers-shared/tests/build-and-push.test.ts

@@ -19,6 +19,7 @@ import {
 	InstanceType,
 	pushBuiltContainerImage,
 	pushCommand,
+	pushImageIfChanged,
 	SchedulingPolicy,
 } from "../index";
 import type { BuiltContainerImage, BuiltImage } from "../src/build";
@@ -314,6 +315,64 @@ describe("buildCommand", () => {
 		]);
 	});
 
+	it("preserves a reusable Build Output image tag across uploads", async ({
+		expect,
+	}) => {
+		const digest =
+			"registry.cloudflare.com/some-account-id/test-app@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+		inspectOutputs = [
+			"[]",
+			"53387881 2",
+			`["${digest}"]`,
+			`["${digest}"]`,
+			"53387881 2",
+		];
+		vi.mocked(execFileSync).mockReturnValue(
+			'{"Descriptor":{"digest":"sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}}'
+		);
+
+		for (let attempt = 0; attempt < 2; attempt++) {
+			await expect(
+				pushImageIfChanged({
+					pathToDocker: "docker",
+					sourceTag: "test-app:tag",
+					targetTag: "test-app:tag",
+					accountId: "some-account-id",
+					containerConfig: dockerfileContainer,
+					cleanupSourceTag: false,
+				})
+			).resolves.toEqual({
+				remoteDigest: `${getCloudflareContainerRegistry()}/some-account-id/test-app@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa`,
+			});
+		}
+
+		expectNoSpawnWith(["image", "rm", "test-app:tag"]);
+		expect(
+			vi.mocked(spawn).mock.calls.filter(([, args]) => args?.[0] === "push")
+		).toHaveLength(1);
+	});
+
+	it("validates a local image against its container disk limit", async ({
+		expect,
+	}) => {
+		inspectOutputs = ["[]", "2200000000 2"];
+
+		await expect(
+			pushImageIfChanged({
+				pathToDocker: "docker",
+				sourceTag: "test-app:tag",
+				targetTag: "test-app:tag",
+				accountId: "some-account-id",
+				containerConfig: dockerfileContainer,
+				cleanupSourceTag: false,
+			})
+		).rejects.toThrow(/Image too large/);
+		expectNoSpawnWith([
+			"push",
+			`${getCloudflareContainerRegistry()}/some-account-id/test-app:tag`,
+		]);
+	});
+
 	it("uses docker manifest inspect when pushed image inspect has no digest", async ({
 		expect,
 	}) => {

packages/deploy-helpers/src/deploy/deploy.ts

@@ -791,12 +791,16 @@ async function deployWorker(
 				});
 			}
 		}
-		await deployContainers(config, containerDeployments, {
-			versionId,
-			accountId,
-			scriptName,
-			dispatchNamespace: props.dispatchNamespace,
-		});
+		await deployContainers(
+			{ ...config, containers: props.containers.source },
+			containerDeployments,
+			{
+				versionId,
+				accountId,
+				scriptName,
+				dispatchNamespace: props.dispatchNamespace,
+			}
+		);
 	}
 	if (!skipContainerChanges && durableObjectContainerConfig.length > 0) {
 		assert(versionId && accountId);