use userConfigPath instead of redirected one

Author: emily-shen

.changeset/breezy-regions-press.md

@@ -0,0 +1,6 @@
+---
+"@cloudflare/containers-shared": patch
+"wrangler": patch
+---
+
+Resolve container image path based on the user's original config path instead of redirected config

packages/containers-shared/src/utils.ts

@@ -102,6 +102,7 @@ export function isDir(path: string) {
 /** returns true if it is a dockerfile, false if it is a registry link, throws if neither */
 export const isDockerfile = (
 	image: string,
+	/** The original (non-redirected) user config path */
 	configPath: string | undefined
 ): boolean => {
 	const baseDir = configPath ? path.dirname(configPath) : process.cwd();

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

@@ -346,6 +346,113 @@ describe("wrangler deploy with containers", () => {
 		expect(std.warn).toMatchInlineSnapshot(`""`);
 	});
 
+	it("resolve the dockerfile based on the non-redirected userConfigPath rather than the actual config path", async () => {
+		vi.stubEnv("WRANGLER_DOCKER_BIN", "/usr/bin/docker");
+		mockGetVersion("Galaxy-Class");
+
+		vi.mocked(spawn)
+			.mockImplementationOnce(mockDockerInfo())
+			.mockImplementationOnce(
+				mockDockerBuild(
+					"my-container",
+					"Galaxy",
+					"FROM scratch",
+					// note that the cwd for the test is not the same as the cwd that the wrangler command is running in
+					// fortunately we are using an absolute path
+					process.cwd()
+				)
+			)
+			.mockImplementationOnce(mockDockerImageInspect("my-container", "Galaxy"))
+			.mockImplementationOnce(mockDockerLogin("mockpassword"))
+			.mockImplementationOnce(
+				mockDockerManifestInspect("some-account-id/my-container", true)
+			)
+			.mockImplementationOnce(
+				mockDockerTag("my-container", "some-account-id/my-container", "Galaxy")
+			)
+			.mockImplementationOnce(
+				mockDockerPush("some-account-id/my-container", "Galaxy")
+			)
+			.mockImplementationOnce(
+				mockDockerImageDelete("some-account-id/my-container", "Galaxy")
+			);
+
+		mockContainersAccount();
+
+		const wranglerConfig = {
+			main: "index.js",
+			durable_objects: {
+				bindings: [
+					{
+						name: "EXAMPLE_DO_BINDING",
+						class_name: "ExampleDurableObject",
+					},
+				],
+			},
+			containers: [
+				{
+					name: "my-container",
+					max_instances: 10,
+					class_name: "ExampleDurableObject",
+					image: "./Dockerfile",
+				},
+			],
+			migrations: [{ tag: "v1", new_sqlite_classes: ["ExampleDurableObject"] }],
+		};
+		// user wrangler config
+		writeWranglerConfig(wranglerConfig, "./wrangler.json");
+		// set up redirected config
+		fs.mkdirSync(".wrangler/deploy", { recursive: true });
+		fs.writeFileSync(
+			".wrangler/deploy/config.json",
+			JSON.stringify({ configPath: "./wrangler.json" })
+		);
+		writeWranglerConfig(
+			{ ...wranglerConfig, main: "../../index.js" },
+			".wrangler/deploy/wrangler.json"
+		);
+		// dockerfile is in the root of the project
+		fs.writeFileSync("Dockerfile", "FROM scratch");
+		mockGetApplications([]);
+
+		mockGenerateImageRegistryCredentials();
+
+		mockCreateApplication({
+			name: "my-container",
+			max_instances: 10,
+			durable_objects: { namespace_id: "1" },
+			configuration: {
+				image:
+					getCloudflareContainerRegistry() +
+					"/some-account-id/my-container:Galaxy",
+			},
+		});
+
+		await runWrangler("deploy");
+		expect(std.info).toMatchInlineSnapshot(`
+			"Using redirected Wrangler configuration.
+			 - Configuration being used: \\".wrangler/deploy/wrangler.json\\"
+			 - Original user's configuration: \\"wrangler.json\\"
+			 - Deploy configuration file: \\".wrangler/deploy/config.json\\""
+		`);
+		expect(std.out).toMatchInlineSnapshot(`
+			"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(`""`);
+	});
 	it("should support deploying a worker with multiple containers", async () => {
 		mockGetVersion(
 			"Galaxy-Class",

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

@@ -400,7 +400,8 @@ async function resolveConfig(
 	// container API client is properly set so that we can get the correct permissions
 	// from the cloudchamber API to pull from the repository.
 	const needsPulling = resolved.containers?.some(
-		(c) => !isDockerfile(c.image ?? c.configuration?.image, config.configPath)
+		(c) =>
+			!isDockerfile(c.image ?? c.configuration?.image, config.userConfigPath)
 	);
 	if (needsPulling && !resolved.dev.remote) {
 		await fillOpenAPIConfiguration(config, containersScope);

packages/wrangler/src/cloudchamber/build.ts

@@ -239,7 +239,7 @@ export async function buildCommand(
 			},
 			getDockerPath() ?? args.pathToDocker,
 			args.push,
-			config.configPath,
+			config.userConfigPath,
 			container
 		);
 	}

packages/wrangler/src/cloudchamber/deploy.ts

@@ -17,6 +17,7 @@ export async function maybeBuildContainer(
 	imageTag: string,
 	dryRun: boolean,
 	pathToDocker: string,
+	/** The original (non-redirected) user config path */
 	configPath?: string
 ): Promise<{ image: string; imageUpdated: boolean }> {
 	try {
@@ -120,7 +121,7 @@ export async function deployContainers(
 			versionId,
 			dryRun,
 			pathToDocker,
-			config.configPath
+			config.userConfigPath
 		);
 		container.configuration ??= {};
 		container.configuration.image = buildResult.image;

packages/wrangler/src/deploy/deploy.ts

@@ -786,7 +786,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			const hasDockerfiles = config.containers.some((container) =>
 				isDockerfile(
 					container.image ?? container.configuration?.image,
-					config.configPath
+					// this is the original (non-redirected) config path
+					config.userConfigPath
 				)
 			);
 			if (hasDockerfiles) {
@@ -802,7 +803,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						workerTag ?? "worker-tag",
 						props.dryRun,
 						dockerPath,
-						config.configPath
+						config.userConfigPath
 					);
 				}
 			}