print containers

Author: emily-shen

packages/wrangler/src/__tests__/containers/deploy.test.ts

@@ -127,6 +127,9 @@ describe("wrangler deploy with containers", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (<cwd>/Dockerfile)
+
 			Uploaded test-name (TIMINGS)
 			Building image my-container:Galaxy
 			Image does not exist remotely, pushing: registry.cloudflare.com/some-account-id/my-container:Galaxy
@@ -202,6 +205,9 @@ describe("wrangler deploy with containers", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (registry.cloudflare.com/hello:world)
+
 			Uploaded test-name (TIMINGS)
 			Deployed test-name triggers (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
@@ -288,6 +294,9 @@ describe("wrangler deploy with containers", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (registry.cloudflare.com/hello:world)
+
 			Uploaded test-name (TIMINGS)
 			Deployed test-name triggers (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
@@ -386,6 +395,9 @@ describe("wrangler deploy with containers", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (registry.cloudflare.com/hello:world)
+
 			Uploaded test-name (TIMINGS)
 			Deployed test-name triggers (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
@@ -476,23 +488,6 @@ describe("wrangler deploy with containers", () => {
 
 		await runWrangler("deploy --cwd src");
 
-		expect(std.out).toMatchInlineSnapshot(`
-			"
-			 ⛅️ wrangler x.x.x
-			──────────────────
-			Total Upload: xx KiB / gzip: xx KiB
-			Worker Startup Time: 100 ms
-			Your Worker has access to the following bindings:
-			Binding                                            Resource
-			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
-
-			Uploaded test-name (TIMINGS)
-			Building image my-container:Galaxy
-			Image does not exist remotely, pushing: registry.cloudflare.com/some-account-id/my-container:Galaxy
-			Deployed test-name triggers (TIMINGS)
-			  https://test-name.test-sub-domain.workers.dev
-			Current Version ID: Galaxy-Class"
-		`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
 		expect(std.warn).toMatchInlineSnapshot(`""`);
 	});
@@ -549,6 +544,9 @@ describe("wrangler deploy with containers", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (<cwd>/Dockerfile)
+
 			Uploaded test-name (TIMINGS)
 			Building image my-container:Galaxy
 			Image does not exist remotely, pushing: registry.cloudflare.com/some-account-id/my-container:Galaxy
@@ -1838,6 +1836,9 @@ describe("wrangler deploy with containers", () => {
 				──────────────────
 				Total Upload: xx KiB / gzip: xx KiB
 				Worker Startup Time: 100 ms
+				The following containers are available:
+				- my-container (registry.cloudflare.com/hello:world)
+
 				Uploaded test-name (TIMINGS)
 				Deployed test-name triggers (TIMINGS)
 				  https://test-name.test-sub-domain.workers.dev
@@ -2086,6 +2087,9 @@ describe("wrangler deploy with containers dry run", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (<cwd>/Dockerfile)
+
 			--dry-run: exiting now."
 		`);
 		expect(cliStd.stdout).toMatchInlineSnapshot(`""`);
@@ -2113,6 +2117,9 @@ describe("wrangler deploy with containers dry run", () => {
 			Binding                                            Resource
 			env.EXAMPLE_DO_BINDING (ExampleDurableObject)      Durable Object
 
+			The following containers are available:
+			- my-container (registry.cloudflare.com/hello:world)
+
 			--dry-run: exiting now."
 		`);
 		expect(cliStd.stdout).toMatchInlineSnapshot(`""`);

packages/wrangler/src/api/startDevWorker/ConfigController.ts

@@ -211,6 +211,7 @@ async function resolveBindings(
 			},
 			input.tailConsumers ?? config.tail_consumers,
 			input.streamingTailConsumers ?? config.streaming_tail_consumers,
+			config.containers,
 			{
 				registry,
 				local: !input.dev?.remote,

packages/wrangler/src/deploy/deploy.ts

@@ -911,6 +911,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 				{ ...withoutStaticAssets, vars: maskedVars },
 				config.tail_consumers,
 				config.streaming_tail_consumers,
+				config.containers,
 				{ warnIfNoBindings: true }
 			);
 		} else {
@@ -1050,7 +1051,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 				printBindings(
 					{ ...withoutStaticAssets, vars: maskedVars },
 					config.tail_consumers,
-					config.streaming_tail_consumers
+					config.streaming_tail_consumers,
+					config.containers
 				);
 
 				versionId = parseNonHyphenedUuid(result.deployment_id);
@@ -1080,7 +1082,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					printBindings(
 						{ ...withoutStaticAssets, vars: maskedVars },
 						config.tail_consumers,
-						config.streaming_tail_consumers
+						config.streaming_tail_consumers,
+						config.containers
 					);
 				}
 				const message = await helpIfErrorIsSizeOrScriptStartup(

packages/wrangler/src/deployment-bundle/bindings.ts

@@ -492,6 +492,7 @@ export async function provisionBindings(
 			printable,
 			config.tail_consumers,
 			config.streaming_tail_consumers,
+			[],
 			{ provisioning: true }
 		);
 		logger.log();

packages/wrangler/src/utils/print-bindings.ts

@@ -4,7 +4,11 @@ import chalk from "chalk";
 import stripAnsi from "strip-ansi";
 import { getFlag } from "../experimental-flags";
 import { logger } from "../logger";
-import type { CfTailConsumer, CfWorkerInit } from "@cloudflare/workers-utils";
+import type {
+	CfTailConsumer,
+	CfWorkerInit,
+	ContainerApp,
+} from "@cloudflare/workers-utils";
 import type { WorkerRegistry } from "miniflare";
 
 /**
@@ -14,6 +18,7 @@ export function printBindings(
 	bindings: Partial<CfWorkerInit["bindings"]>,
 	tailConsumers: CfTailConsumer[] = [],
 	streamingTailConsumers: CfTailConsumer[] = [],
+	containers: ContainerApp[] = [],
 	context: {
 		registry?: WorkerRegistry | null;
 		local?: boolean;
@@ -739,10 +744,26 @@ export function printBindings(
 		);
 	}
 
+	if (containers.length > 0) {
+		let containersTitle = "The following containers are available:";
+		if (context.name && getFlag("MULTIWORKER")) {
+			containersTitle = `The following containers are available from ${chalk.blue(context.name)}:`;
+		}
+
+		logger.log(
+			`${containersTitle}\n${containers
+				.map((c) => {
+					return `- ${c.name} (${c.image})`;
+				})
+				.join("\n")}`
+		);
+		logger.log();
+	}
+
 	if (hasConnectionStatus) {
 		logger.once.info(
 			dim(
-				`\nService bindings, Durable Object bindings, and Tail consumers connect to other wrangler or vite dev processes running locally, with their connection status indicated by ${chalk.green("[connected]")} or ${chalk.red("[not connected]")}. For more details, refer to https://developers.cloudflare.com/workers/runtime-apis/bindings/service-bindings/#local-development\n`
+				`\nService bindings, Durable Object bindings, and Tail consumers connect to other Wrangler or Vite dev processes running locally, with their connection status indicated by ${chalk.green("[connected]")} or ${chalk.red("[not connected]")}. For more details, refer to https://developers.cloudflare.com/workers/runtime-apis/bindings/service-bindings/#local-development\n`
 			)
 		);
 	}