Containers fixups (#9653)

penalosa · CarmenPopoviciu · web-flow · commit 8a60fe76ec5e · 2025-06-19T16:54:33.000+02:00
* Rename docker bin override env var

* Add warning banner to containers + cloudchamber commands

* fix test

* Create clever-crews-destroy.md

* Create giant-kiwis-provide.md

---------

Co-authored-by: Carmen Popoviciu &lt;cpopoviciu@cloudflare.com&gt;
diff --git a/.changeset/clever-crews-destroy.md b/.changeset/clever-crews-destroy.md
@@ -0,0 +1,6 @@
+---
+"@cloudflare/containers-shared": patch
+"wrangler": patch
+---
+
+Rename `WRANGLER_CONTAINERS_DOCKER_PATH` to `WRANGLER_DOCKER_BIN`
diff --git a/.changeset/giant-kiwis-provide.md b/.changeset/giant-kiwis-provide.md
@@ -0,0 +1,6 @@
+---
+"@cloudflare/containers-shared": patch
+"wrangler": patch
+---
+
+Add a warning banner to `wrangler cloudchamber` and `wrangler containers` commands
diff --git a/packages/containers-shared/src/utils.ts b/packages/containers-shared/src/utils.ts
@@ -35,7 +35,7 @@ export const verifyDockerInstalled = async (dockerPath: string) => {
 	} catch {
 		// We assume this command is unlikely to fail for reasons other than the Docker CLI not being installed or not being in the PATH.
 		throw new Error(
-			`The Docker CLI does not appear to installed. Please ensure that the Docker CLI is installed. You can specify an executable with the environment variable WRANGLER_CONTAINERS_DOCKER_PATH.\n` +
+			`The Docker CLI does not appear to installed. Please ensure that the Docker CLI is installed. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN.\n` +
 				`Other container tooling that is compatible with the Docker CLI may work, but is not yet guaranteed to do so.\n` +
 				`To suppress this error if you do not intend on triggering any container instances, set dev.enable_containers to false in your Wrangler config or passing in --enable-containers=false.`
 		);
diff --git a/packages/wrangler/e2e/containers.dev.test.ts b/packages/wrangler/e2e/containers.dev.test.ts
@@ -141,11 +141,11 @@ describe.skipIf(process.platform !== "linux" && process.env.CI === "true")(
 		});
 
 		it("errors if docker is not installed", async () => {
-			vi.stubEnv("WRANGLER_CONTAINERS_DOCKER_PATH", "not-a-real-docker-binary");
+			vi.stubEnv("WRANGLER_DOCKER_BIN", "not-a-real-docker-binary");
 			const worker = helper.runLongLived("wrangler dev");
 			expect(await worker.exitCode).toBe(1);
 			expect(await worker.output).toContain(
-				`The Docker CLI does not appear to installed. Please ensure that the Docker CLI is installed. You can specify an executable with the environment variable WRANGLER_CONTAINERS_DOCKER_PATH.`
+				`The Docker CLI does not appear to installed. Please ensure that the Docker CLI is installed. You can specify an executable with the environment variable WRANGLER_DOCKER_BIN.`
 			);
 		});
 	}
diff --git a/packages/wrangler/src/__tests__/cloudchamber/build.test.ts b/packages/wrangler/src/__tests__/cloudchamber/build.test.ts
@@ -57,7 +57,7 @@ describe("buildAndMaybePush", () => {
 	});
 
 	it("should use a custom docker path if provided", async () => {
-		vi.stubEnv("WRANGLER_CONTAINERS_DOCKER_PATH", "/custom/docker/path");
+		vi.stubEnv("WRANGLER_DOCKER_BIN", "/custom/docker/path");
 		await runWrangler(
 			"containers build ./container-context -t test-app:tag -p"
 		);
diff --git a/packages/wrangler/src/__tests__/deploy.test.ts b/packages/wrangler/src/__tests__/deploy.test.ts
@@ -8668,7 +8668,7 @@ addEventListener('fetch', event => {});`
 			});
 
 			it("should support durable object bindings to SQLite classes with containers (docker flow)", async () => {
-				vi.stubEnv("WRANGLER_CONTAINERS_DOCKER_PATH", "/usr/bin/docker");
+				vi.stubEnv("WRANGLER_DOCKER_BIN", "/usr/bin/docker");
 				function mockGetVersion(versionId: string) {
 					msw.use(
 						http.get(
diff --git a/packages/wrangler/src/cloudchamber/common.ts b/packages/wrangler/src/cloudchamber/common.ts
@@ -10,6 +10,7 @@ import {
 import { version as wranglerVersion } from "../../package.json";
 import { readConfig } from "../config";
 import { getConfigCache, purgeConfigCaches } from "../config-cache";
+import { constructStatusMessage } from "../core/CommandRegistry";
 import { getCloudflareApiBaseUrl } from "../environment-variables/misc-variables";
 import { UserError } from "../errors";
 import { isNonInteractiveOrCI } from "../is-interactive";
@@ -26,6 +27,7 @@ import {
 	requireAuth,
 	setLoginScopeKeys,
 } from "../user";
+import { printWranglerBanner } from "../wrangler-banner";
 import { parseByteSize } from "./../parse";
 import { wrap } from "./helpers/wrap";
 import { idToLocationName, loadAccount } from "./locations";
@@ -103,6 +105,7 @@ export function handleFailure<
 		? K
 		: never,
 >(
+	command: string,
 	cb: (args: CommandArgumentsObject, config: Config) => Promise<void>
 ): (
 	args: CommonYargsOptions &
@@ -111,6 +114,10 @@ export function handleFailure<
 ) => Promise<void> {
 	return async (args) => {
 		try {
+			if (!args.json) {
+				await printWranglerBanner();
+				logger.warn(constructStatusMessage(command, "alpha"));
+			}
 			const config = readConfig(args);
 			await fillOpenAPIConfiguration(config, args.json);
 			await cb(args, config);
diff --git a/packages/wrangler/src/cloudchamber/images/images.ts b/packages/wrangler/src/cloudchamber/images/images.ts
@@ -68,6 +68,7 @@ export const registriesCommand = (yargs: CommonYargsArgvJSON) => {
 			(args) => configureImageRegistryOptionalYargs(args),
 			(args) =>
 				handleFailure(
+					`wrangler cloudchamber registries configure`,
 					async (
 						imageArgs: StrictYargsOptionsToInterfaceJSON<
 							typeof configureImageRegistryOptionalYargs
@@ -119,6 +120,7 @@ export const registriesCommand = (yargs: CommonYargsArgvJSON) => {
 				// we don't want any kind of spinners
 				args.json = true;
 				return handleFailure(
+					`wrangler cloudchamber registries credentials`,
 					async (
 						imageArgs: StrictYargsOptionsToInterfaceJSON<
 							typeof credentialsImageRegistryYargs
@@ -154,6 +156,7 @@ export const registriesCommand = (yargs: CommonYargsArgvJSON) => {
 			(args) => {
 				args.json = true;
 				return handleFailure(
+					`wrangler cloudchamber registries remove`,
 					async (
 						imageArgs: StrictYargsOptionsToInterfaceJSON<
 							typeof removeImageRegistryYargs
@@ -174,6 +177,7 @@ export const registriesCommand = (yargs: CommonYargsArgvJSON) => {
 			(args) => args,
 			(args) =>
 				handleFailure(
+					`wrangler cloudchamber registries list`,
 					async (imageArgs: CommonYargsArgvSanitizedJSON, config) => {
 						if (!interactWithUser(imageArgs)) {
 							const registries =
diff --git a/packages/wrangler/src/cloudchamber/images/list.ts b/packages/wrangler/src/cloudchamber/images/list.ts
@@ -28,18 +28,24 @@ export const imagesCommand = (yargs: CommonYargsArgvJSON) => {
 			"perform operations on images in your Cloudflare managed registry",
 			(args) => listImagesYargs(args),
 			(args) =>
-				handleFailure(async (_args: CommonYargsArgvSanitizedJSON, config) => {
-					await handleListImagesCommand(args, config);
-				})(args)
+				handleFailure(
+					`wrangler containers images list`,
+					async (_args: CommonYargsArgvSanitizedJSON, config) => {
+						await handleListImagesCommand(args, config);
+					}
+				)(args)
 		)
 		.command(
 			"delete [image]",
 			"remove an image from your Cloudflare managed registry",
 			(args) => deleteImageYargs(args),
 			(args) =>
-				handleFailure(async (_args: CommonYargsArgvSanitizedJSON, config) => {
-					await handleDeleteImageCommand(args, config);
-				})(args)
+				handleFailure(
+					`wrangler containers images delete`,
+					async (_args: CommonYargsArgvSanitizedJSON, config) => {
+						await handleDeleteImageCommand(args, config);
+					}
+				)(args)
 		);
 };
 
diff --git a/packages/wrangler/src/cloudchamber/index.ts b/packages/wrangler/src/cloudchamber/index.ts
@@ -33,25 +33,28 @@ export const cloudchamber = (
 			"delete [deploymentId]",
 			"Delete an existing deployment that is running in the Cloudflare edge",
 			(args) => deleteCommandOptionalYargs(args),
-			(args) => handleFailure(deleteCommand)(args)
+			(args) =>
+				handleFailure(`wrangler cloudchamber delete`, deleteCommand)(args)
 		)
 		.command(
 			"create",
 			"Create a new deployment",
 			(args) => createCommandOptionalYargs(args),
-			(args) => handleFailure(createCommand)(args)
+			(args) =>
+				handleFailure(`wrangler cloudchamber create`, createCommand)(args)
 		)
 		.command(
 			"list [deploymentIdPrefix]",
 			"List and view status of deployments",
 			(args) => listDeploymentsYargs(args),
-			(args) => handleFailure(listCommand)(args)
+			(args) => handleFailure(`wrangler cloudchamber list`, listCommand)(args)
 		)
 		.command(
 			"modify [deploymentId]",
 			"Modify an existing deployment",
 			(args) => modifyCommandOptionalYargs(args),
-			(args) => handleFailure(modifyCommand)(args)
+			(args) =>
+				handleFailure(`wrangler cloudchamber modify`, modifyCommand)(args)
 		)
 		.command("ssh", "Manage the ssh keys of your account", (args) =>
 			sshCommand(args).command(subHelp)
@@ -63,25 +66,25 @@ export const cloudchamber = (
 			"curl <path>",
 			"send a request to an arbitrary cloudchamber endpoint",
 			(args) => yargsCurl(args),
-			(args) => handleFailure(curlCommand)(args)
+			(args) => handleFailure(`wrangler cloudchamber curl`, curlCommand)(args)
 		)
 		.command(
 			"apply",
 			"apply the changes in the container applications to deploy",
 			(args) => applyCommandOptionalYargs(args),
-			(args) => handleFailure(applyCommand)(args)
+			(args) => handleFailure(`wrangler cloudchamber apply`, applyCommand)(args)
 		)
 		.command(
 			"build [PATH]",
 			"build a dockerfile",
 			(args) => buildYargs(args),
-			(args) => handleFailure(buildCommand)(args)
+			(args) => handleFailure(`wrangler cloudchamber build`, buildCommand)(args)
 		)
 		.command(
 			"push [TAG]",
 			"push a tagged image to a Cloudflare managed registry, which is automatically integrated with your account",
 			(args) => pushYargs(args),
-			(args) => handleFailure(pushCommand)(args)
+			(args) => handleFailure(`wrangler cloudchamber push`, pushCommand)(args)
 		)
 		.command(
 			"images",
diff --git a/packages/wrangler/src/cloudchamber/ssh/ssh.ts b/packages/wrangler/src/cloudchamber/ssh/ssh.ts
@@ -113,23 +113,27 @@ export const sshCommand = (yargs: CommonYargsArgvJSON) => {
 			"list the ssh keys added to your account",
 			(args) => args,
 			(args) =>
-				handleFailure(async (sshArgs: CommonYargsArgvSanitizedJSON, config) => {
-					// check we are in CI or if the user wants to just use JSON
-					if (!interactWithUser(sshArgs)) {
-						const sshKeys = await SshPublicKeysService.listSshPublicKeys();
-						console.log(JSON.stringify(sshKeys, null, 4));
-						return;
-					}
+				handleFailure(
+					`wrangler cloudchamber ssh list`,
+					async (sshArgs: CommonYargsArgvSanitizedJSON, config) => {
+						// check we are in CI or if the user wants to just use JSON
+						if (!interactWithUser(sshArgs)) {
+							const sshKeys = await SshPublicKeysService.listSshPublicKeys();
+							console.log(JSON.stringify(sshKeys, null, 4));
+							return;
+						}
 
-					await handleListSSHKeysCommand(sshArgs, config);
-				})(args)
+						await handleListSSHKeysCommand(sshArgs, config);
+					}
+				)(args)
 		)
 		.command(
 			"create",
 			"create an ssh key",
 			(args) => createSSHPublicKeyOptionalYargs(args),
 			(args) =>
 				handleFailure(
+					`wrangler cloudchamber ssh create`,
 					async (
 						sshArgs: StrictYargsOptionsToInterfaceJSON<
 							typeof createSSHPublicKeyOptionalYargs
diff --git a/packages/wrangler/src/containers/index.ts b/packages/wrangler/src/containers/index.ts
@@ -26,13 +26,13 @@ export const containers = (
 			"build [PATH]",
 			"build a dockerfile",
 			(args) => buildYargs(args),
-			(args) => handleFailure(buildCommand)(args)
+			(args) => handleFailure(`wrangler containers build`, buildCommand)(args)
 		)
 		.command(
 			"push [TAG]",
 			"push a tagged image to a Cloudflare managed registry, which is automatically integrated with your account",
 			(args) => pushYargs(args),
-			(args) => handleFailure(pushCommand)(args)
+			(args) => handleFailure(`wrangler containers push`, pushCommand)(args)
 		)
 		.command(
 			"images",
@@ -43,18 +43,18 @@ export const containers = (
 			"info [ID]",
 			"get information about a specific container",
 			(args) => infoYargs(args),
-			(args) => handleFailure(infoCommand)(args)
+			(args) => handleFailure(`wrangler containers info`, infoCommand)(args)
 		)
 		.command(
 			"list",
 			"list containers",
 			(args) => listYargs(args),
-			(args) => handleFailure(listCommand)(args)
+			(args) => handleFailure(`wrangler containers list`, listCommand)(args)
 		)
 		.command(
 			"delete [ID]",
 			"delete a container",
 			(args) => deleteYargs(args),
-			(args) => handleFailure(deleteCommand)(args)
+			(args) => handleFailure(`wrangler containers delete`, deleteCommand)(args)
 		);
 };
diff --git a/packages/wrangler/src/core/CommandRegistry.ts b/packages/wrangler/src/core/CommandRegistry.ts
@@ -12,6 +12,7 @@ import type {
 	DefinitionTree,
 	DefinitionTreeNode,
 	InternalDefinition,
+	Metadata,
 	NamedArgDefinitions,
 	NamespaceDefinition,
 } from "./types";
@@ -461,10 +462,10 @@ export class CommandRegistry {
 				` [${def.metadata.status}]`
 			);
 
-			const indefiniteArticle = "aeiou".includes(def.metadata.status[0])
-				? "an"
-				: "a";
-			def.metadata.statusMessage ??= `🚧 \`${def.command}\` is ${indefiniteArticle} ${def.metadata.status} command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose`;
+			def.metadata.statusMessage ??= constructStatusMessage(
+				def.command,
+				def.metadata.status
+			);
 		}
 
 		if (def.type === "command") {
@@ -512,3 +513,11 @@ type RegisterCommand = (
 	def: InternalDefinition,
 	registerSubTreeCallback: () => void
 ) => void;
+
+export function constructStatusMessage(
+	command: string,
+	status: Metadata["status"]
+) {
+	const indefiniteArticle = "aeiou".includes(status[0]) ? "an" : "a";
+	return `🚧 \`${command}\` is ${indefiniteArticle} ${status} command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose`;
+}
diff --git a/packages/wrangler/src/environment-variables/factory.ts b/packages/wrangler/src/environment-variables/factory.ts
@@ -32,7 +32,7 @@ type VariableNames =
 	| "WRANGLER_BUILD_CONDITIONS"
 	| "WRANGLER_BUILD_PLATFORM"
 	| "WRANGLER_REGISTRY_PATH"
-	| "WRANGLER_CONTAINERS_DOCKER_PATH"
+	| "WRANGLER_DOCKER_BIN"
 	| "WRANGLER_DOCKER_HOST";
 
 type DeprecatedNames =
diff --git a/packages/wrangler/src/environment-variables/misc-variables.ts b/packages/wrangler/src/environment-variables/misc-variables.ts
@@ -241,12 +241,12 @@ export const getRegistryPath = getEnvironmentVariableFactory({
 });
 
 /**
- * `WRANGLER_CONTAINERS_DOCKER_PATH` specifies the path to a docker binary.
+ * `WRANGLER_DOCKER_BIN` specifies the path to a docker binary.
  *
  * By default it's `docker`.
  */
 export const getDockerPath = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_CONTAINERS_DOCKER_PATH",
+	variableName: "WRANGLER_DOCKER_BIN",
 	defaultValue() {
 		return "docker";
 	},
diff --git a/packages/wrangler/turbo.json b/packages/wrangler/turbo.json
@@ -33,7 +33,7 @@
 				"https_proxy",
 				"HTTPS_PROXY",
 				"HYPERDRIVE_DATABASE_URL",
-				"WRANGLER_CONTAINERS_DOCKER_PATH",
+				"WRANGLER_DOCKER_BIN",
 				"WRANGLER_DOCKER_HOST",
 				"LC_ALL",
 				"NO_D1_WARNING",
