rebase fixups

Author: emily-shen

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

@@ -228,18 +228,18 @@ export class LocalRuntimeController extends RuntimeController {
 				data.config.dev.enableContainers &&
 				this.#currentContainerBuildId !== data.config.dev.containerBuildId
 			) {
-				this.#dockerPath = data.config.dev?.dockerPath ?? getDockerPath();
+				this.dockerPath = data.config.dev?.dockerPath ?? getDockerPath();
 				assert(
 					data.config.dev.containerBuildId,
 					"Build ID should be set if containers are enabled and defined"
 				);
-				const containerDevOptions = await getContainerOptions(
+				const containerDevOptions = await getContainerDevOptions(
 					data.config.containers,
 					data.config.dev.containerBuildId
 				);
 
 				for (const container of containerDevOptions) {
-					this.#containerImageTagsSeen.add(container.image_tag);
+					this.containerImageTagsSeen.add(container.image_tag);
 				}
 				logger.log(chalk.dim("⎔ Preparing container image(s)..."));
 				await prepareContainerImagesForDev({
@@ -438,7 +438,7 @@ export class LocalRuntimeController extends RuntimeController {
  * with image tag set to well-known dev format.
  * Undefined if containers are not enabled or not configured.
  */
-export async function getContainerOptions(
+export async function getContainerDevOptions(
 	containersConfig: NonNullable<BundleCompleteEvent["config"]["containers"]>,
 	containerBuildId: string
 ) {

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

@@ -9,7 +9,7 @@ import { logger } from "../../logger";
 import { castErrorCause } from "./events";
 import {
 	convertToConfigBundle,
-	getContainerOptions,
+	getContainerDevOptions,
 	LocalRuntimeController,
 } from "./LocalRuntimeController";
 import { convertCfWorkerInitBindingsToBindings } from "./utils";
@@ -137,21 +137,27 @@ export class MultiworkerRuntimeController extends LocalRuntimeController {
 				);
 			}
 
-			// Assemble container options and build if necessary
-			const containerOptions = await getContainerOptions(data.config);
-			this.dockerPath = data.config.dev?.dockerPath ?? getDockerPath();
-			// keep track of them so we can clean up later
-			for (const container of containerOptions ?? []) {
-				this.containerImageTagsSeen.add(container.imageTag);
-			}
 			if (
-				containerOptions &&
+				data.config.containers?.length &&
 				this.#currentContainerBuildId !== data.config.dev.containerBuildId
 			) {
 				logger.log(chalk.dim("⎔ Preparing container image(s)..."));
+				// Assemble container options and build if necessary
+				assert(
+					data.config.dev.containerBuildId,
+					"Build ID should be set if containers are enabled and defined"
+				);
+				const containerOptions = await getContainerDevOptions(
+					data.config.containers,
+					data.config.dev.containerBuildId
+				);
+				this.dockerPath = data.config.dev?.dockerPath ?? getDockerPath();
+				// keep track of them so we can clean up later
+				for (const container of containerOptions ?? []) {
+					this.containerImageTagsSeen.add(container.image_tag);
+				}
 				await prepareContainerImagesForDev({
 					dockerPath: this.dockerPath,
-					configPath: data.config.config,
 					containerOptions,
 					onContainerImagePreparationStart: (buildStartEvent) => {
 						this.containerBeingBuilt = {