miscellaneous fixes

Author: emily-shen

public/__redirects

@@ -2398,4 +2398,10 @@
 /ai-gateway/guardrails/* /ai-gateway/features/guardrails/:splat 301
 /ai-gateway/websockets-api/* /ai-gateway/usage/websockets-api/:splat 301
 
-
+# Containers
+/containers/platform-details/#limits /containers/platform-details/limits 301
+/containers/image-management /containers/platform-details/image-management 301
+/containers/scaling-and-routing /containers/platform-details/scaling-and-routing 301
+/containers/architecture /containers/platform-details/architecture 301
+/containers/durable-object-methods /containers/platform-details/durable-object-methods 301
+/containers/platform-details /containers/platform-details/architecture 301

src/content/docs/containers/beta-info.mdx

@@ -38,7 +38,6 @@ We plan to automatically reduce log noise in the future.
 
 The dashboard will be updated to show:
 
-- the status of Container rollouts
 - links from Workers to their associated Containers
 
 ### Co-locating Durable Objects and Containers

src/content/docs/containers/container-package.mdx

@@ -6,7 +6,7 @@ sidebar:
 ---
 
 When writing code that interacts with a container instance, you can either use a
-Durable Object directly or use the [`Container` module](https://github.com/cloudflare/containers)
+[Durable Object directly](/containers/platform-details/durable-object-methods) or use the [`Container` module](https://github.com/cloudflare/containers)
 importable from [`@cloudflare/containers`](https://www.npmjs.com/package/@cloudflare/containers).
 
 ```javascript

src/content/docs/containers/examples/cron.mdx

@@ -1,5 +1,4 @@
 ---
-
 summary: Running a container on a schedule using Cron Triggers
 pcx_content_type: example
 title: Cron Container
@@ -43,9 +42,7 @@ Use a cron expression in your Wrangler config to specify the schedule:
 	},
 	"migrations": [
 		{
-			"new_sqlite_classes": [
-				"CronContainer"
-			],
+			"new_sqlite_classes": ["CronContainer"],
 			"tag": "v1"
 		}
 	]
@@ -61,7 +58,6 @@ import { Container, getContainer } from "@cloudflare/containers";
 
 export class CronContainer extends Container {
 	sleepAfter = "5m";
-	manualStart = true;
 }
 
 export default {
@@ -71,13 +67,16 @@ export default {
 		);
 	},
 
+	// scheduled is called when a cron trigger fires
 	async scheduled(
 		_controller: any,
 		env: { CRON_CONTAINER: DurableObjectNamespace<CronContainer> },
 	) {
-		await getContainer(env.CRON_CONTAINER).startContainer({
-			envVars: {
-				MESSAGE: "Start Time: " + new Date().toISOString(),
+		await getContainer(env.CRON_CONTAINER).startAndWaitForPorts({
+			startOptions: {
+				envVars: {
+					MESSAGE: "Start Time: " + new Date().toISOString(),
+				},
 			},
 		});
 	},

src/content/docs/containers/examples/env-vars-and-secrets.mdx

@@ -10,7 +10,7 @@ description: Pass in environment variables and secrets to your container
 import { WranglerConfig, PackageManagers } from "~/components";
 
 Environment variables can be passed into a Container using the `envVars` field
-in the `Container` class, or by setting manually when the Container starts.
+in the [`Container`](/containers/container-package) class, or by setting manually when the Container starts.
 
 Secrets can be passed into a Container by using [Worker Secrets](/workers/configuration/secrets/)
 or the [Secret Store](/secrets-store/integrations/workers/), then passing them into the Container
@@ -111,14 +111,13 @@ set as environment variables when it launches.
 
 But what if you want to set environment variables on a per-instance basis?
 
-In this case, set `manualStart` then use the `start` method to pass in environment variables for each instance.
+In this case, use the `startAndWaitForPorts()` method to pass in environment variables for each instance.
 We'll assume that we've set additional secrets in the Secret Store.
 
 ```js
 export class MyContainer extends Container {
 	defaultPort = 8080;
 	sleepAfter = "10s";
-	manualStart = true;
 }
 
 export default {
@@ -129,19 +128,23 @@ export default {
 
 			// Each instance gets a different set of environment variables
 
-			await instanceOne.start({
-				envVars: {
-					ACCOUNT_NAME: env.ACCOUNT_NAME + "-1",
-					ACCOUNT_API_KEY: env.SECRET_STORE.ACCOUNT_API_KEY_ONE,
-					CONTAINER_SECRET_KEY: env.CONTAINER_SECRET_KEY_TWO,
+			await instanceOne.startAndWaitForPorts({
+				startOptions: {
+					envVars: {
+						ACCOUNT_NAME: env.ACCOUNT_NAME + "-1",
+						ACCOUNT_API_KEY: env.SECRET_STORE.ACCOUNT_API_KEY_ONE,
+						CONTAINER_SECRET_KEY: env.CONTAINER_SECRET_KEY_TWO,
+					},
 				},
 			});
 
-			await instanceTwo.start({
-				envVars: {
-					ACCOUNT_NAME: env.ACCOUNT_NAME + "-2",
-					ACCOUNT_API_KEY: env.SECRET_STORE.ACCOUNT_API_KEY_TWO,
-					CONTAINER_SECRET_KEY: env.CONTAINER_SECRET_KEY_TWO,
+			await instanceTwo.startAndWaitForPorts({
+				startOptions: {
+					envVars: {
+						ACCOUNT_NAME: env.ACCOUNT_NAME + "-2",
+						ACCOUNT_API_KEY: env.SECRET_STORE.ACCOUNT_API_KEY_TWO,
+						CONTAINER_SECRET_KEY: env.CONTAINER_SECRET_KEY_TWO,
+					},
 				},
 			});
 			return new Response("Container instances launched");
@@ -151,3 +154,7 @@ export default {
 	},
 };
 ```
+
+## Build-time environment variables
+
+Finally, you can also set build-time environment variables that are only available when building the container image via the `image_vars` field in the Wrangler configuration.

src/content/docs/containers/faq.mdx

@@ -85,7 +85,7 @@ on image size and code execution time, among other factors.
 
 ## How do I use an existing container image?
 
-See [image management documentation](/containers/image-management/#using-existing-images) for details.
+See [image management documentation](/containers/platform-details/image-management/#using-existing-images) for details.
 
 ## Is disk persistent? What happens to my disk when my container sleeps?
 

src/content/docs/containers/get-started.mdx

@@ -17,7 +17,7 @@ This example Worker should give you a sense for simple Container use, and provid
 ### Ensure Docker is running locally
 
 In this guide, we will build and push a container image alongside your Worker code. By default, this process uses
-[Docker](https://www.docker.com/) to do so. You must have Docker running locally when you run `wrangler deploy`. For most people, the best way to install Docker is to follow the [docs for installing Docker Desktop](https://docs.docker.com/desktop/).
+[Docker](https://www.docker.com/) to do so. You must have Docker running locally when you run `wrangler deploy`. For most people, the best way to install Docker is to follow the [docs for installing Docker Desktop](https://docs.docker.com/desktop/). Other tools like [Colima](https://github.com/abiosoft/colima) may also work.
 
 You can check that Docker is running properly by running the `docker info` command in your terminal. If Docker is running, the command will succeed. If Docker is not running,
 the `docker info` command will hang or return an error including the message "Cannot connect to the Docker daemon".
@@ -29,9 +29,11 @@ the `docker info` command will hang or return an error including the message "Ca
 
 Run the following command to create and deploy a new Worker with a container, from the starter template:
 
-```sh
-npm create cloudflare@latest -- --template=cloudflare/templates/containers-template
-```
+<PackageManagers
+	type="create"
+	pkg="cloudflare@latest"
+	args={"--template=cloudflare/templates/containers-template"}
+/>
 
 When you want to deploy a code change to either the Worker or Container code, you can run the following command using [Wrangler CLI](/workers/wrangler/):
 
@@ -40,7 +42,7 @@ When you want to deploy a code change to either the Worker or Container code, yo
 When you run `wrangler deploy`, the following things happen:
 
 - Wrangler builds your container image using Docker.
-- Wrangler pushes your image to a [Container Image Registry](/containers/image-management/) that is automatically
+- Wrangler pushes your image to a [Container Image Registry](/containers/platform-details/image-management/) that is automatically
   integrated with your Cloudflare account.
 - Wrangler deploys your Worker, and configures Cloudflare's network to be ready to spawn instances of your container
 
@@ -67,7 +69,7 @@ And see images deployed to the Cloudflare Registry with the following command:
 
 Now, open the URL for your Worker. It should look something like `https://hello-containers.YOUR_ACCOUNT_NAME.workers.dev`.
 
-If you make requests to the paths `/container/1` or `/container/2`, these requests are routed to specific containers.
+If you make requests to the paths `/container/1` or `/container/2`, your Worker routes requests to specific containers.
 Each different path after "/container/" routes to a unique container.
 
 If you make requests to `/lb`, you will load balanace requests to one of 3 containers chosen at random.

src/content/docs/containers/index.mdx

@@ -45,66 +45,72 @@ With Containers you can run:
 - Applications and libraries that require a full filesystem, specific runtime, or Linux-like environment
 - Existing applications and tools that have been distributed as container images
 
-Container instances are spun up on-demand and controlled by code you write in your [Worker](/workers).  Instead of chaining together API calls or writing Kubernetes operators, you just write JavaScript:
+Container instances are spun up on-demand and controlled by code you write in your [Worker](/workers). Instead of chaining together API calls or writing Kubernetes operators, you just write JavaScript:
+
 <Tabs>
 	<TabItem label="Worker Code">
-```js
-import { Container, getContainer } from "@cloudflare/containers";
-
-export class MyContainer extends Container {
-	defaultPort = 4000; // Port the container is listening on
-	sleepAfter = "10m"; // Stop the instance if requests not sent for 10 minutes
-}
-
-async fetch(request, env) {
-	const { "session-id": sessionId } = await request.json();
-	// Get the container instance for the given session ID
-	const containerInstance = getContainer(env.MY_CONTAINER, sessionId)
-	// Pass the request to the container instance on its default port
-	return containerInstance.fetch(request);
-}
+		```js
+		import { Container, getContainer } from "@cloudflare/containers";
+
+    	export class MyContainer extends Container {
+    		defaultPort = 4000; // Port the container is listening on
+    		sleepAfter = "10m"; // Stop the instance if requests not sent for 10 minutes
+    	}
+
+    	async fetch(request, env) {
+    	const { "session-id": sessionId } = await request.json();
+    	// Get the container instance for the given session ID
+    	const containerInstance = getContainer(env.MY_CONTAINER, sessionId)
+    	// Pass the request to the container instance on its default port
+    	return containerInstance.fetch(request);
+    	}
+    	```
 
-```
 </TabItem>
 <TabItem label="Worker Config">
 <WranglerConfig>
 
 ```json
 {
-  "name": "container-starter",
-  "main": "src/index.js",
-  "containers": [
-    {
-      "class_name": "MyContainer",
-      "image": "./Dockerfile",
-      "instances": 5,
-    }
-  ],
-  "durable_objects": {
+	"name": "container-starter",
+	"main": "src/index.js",
+	"containers": [
+		{
+			"class_name": "MyContainer",
+			"image": "./Dockerfile",
+			"max_instances": 5
+		}
+	],
+	"durable_objects": {
 		"bindings": [
 			{
 				"class_name": "MyContainer",
-        "name": "MY_CONTAINER"
-      }
-    ]
-  },
+				"name": "MY_CONTAINER"
+			}
+		]
+	},
 	"migrations": [
 		{
-			"new_sqlite_classes": [
-				"MyContainer"
-			],
+			"new_sqlite_classes": ["MyContainer"],
 			"tag": "v1"
 		}
-	],
+	]
 }
 ```
 
 </WranglerConfig>
 </TabItem>
 </Tabs>
 
-
- <LinkButton variant="primary" href="/containers/get-started/">Get started</LinkButton> <LinkButton variant="secondary" href="https://dash.cloudflare.com/?to=/:account/workers/containers">Containers dashboard</LinkButton>
+<LinkButton variant="primary" href="/containers/get-started/">
+	Get started
+</LinkButton>
+<LinkButton
+	variant="secondary"
+	href="https://dash.cloudflare.com/?to=/:account/workers/containers"
+>
+	Containers dashboard
+</LinkButton>
 
 ---
 
@@ -146,7 +152,11 @@ regional placement, Workflow and Queue integrations, AI-generated code execution
 	containers with Wrangler.
 </LinkTitleCard>
 
-<LinkTitleCard title="Limits" href="/containers/platform-details/#limits" icon="seti:lock">
+<LinkTitleCard
+	title="Limits"
+	href="/containers/platform-details/#limits"
+	icon="seti:lock"
+>
 	Learn about what limits Containers have and how to work within them.
 </LinkTitleCard>
 
@@ -160,4 +170,3 @@ regional placement, Workflow and Queue integrations, AI-generated code execution
 </LinkTitleCard>
 
 </CardGrid>
-

src/content/docs/containers/local-dev.mdx

@@ -5,30 +5,35 @@ sidebar:
   order: 6
 ---
 
-You can run both your container and your Worker locally, without additional configuration, by running [`npx wrangler dev`](/workers/wrangler/commands/#dev) (or `vite dev` for Vite projects using the [Cloudflare Vite plugin](/workers/vite-plugin/)) in your project's directory.
+You can run both your container and your Worker locally by simply running [`npx wrangler dev`](/workers/wrangler/commands/#dev) (or `vite dev` for Vite projects using the [Cloudflare Vite plugin](/workers/vite-plugin/)) in your project's directory.
 
 To develop Container-enabled Workers locally, you will need to first ensure that a
 Docker compatible CLI tool and Engine are installed. For instance, you could use [Docker Desktop](https://docs.docker.com/desktop/) or [Colima](https://github.com/abiosoft/colima).
 
 When you start a dev session, your container image will be built or downloaded. If your
 [Wrangler configuration](/workers/wrangler/configuration/#containers) sets
 the `image` attribute to a local path, the image will be built using the local Dockerfile.
-If the `image` attribute is set to a URL, the image will be pulled from the associated registry.
+If the `image` attribute is set to a URL, the image will be pulled from the Cloudflare registry.
+
+:::note
+Currently, the Cloudflare Vite-plugin does not support registry links in local development, unlike `wrangler dev`.
+As a workaround, you can create a minimal Dockerfile that uses `FROM <registry-link>`. Make sure to `EXPOSE` a port for local dev as well.
+:::
 
 Container instances will be launched locally when your Worker code calls to create
-a new container. This may happen when calling `.get()` on a `Container` instance or
-by calling `start()` if `manualStart` is set to `true`. Requests will then automatically be routed to the correct locally-running container.
+a new container. Requests will then automatically be routed to the correct locally-running container.
 
 When the dev session ends, all associated container instances should be stopped, but
 local images are not removed, so that they can be reused in subsequent builds.
 
 :::note
 If your Worker app creates many container instances, your local machine may not be able to run as many containers concurrently as is possible when you deploy to Cloudflare.
 
+Also, `max_instances` configuration option does not apply during local development.
+
 Additionally, if you regularly rebuild containers locally, you may want to clear
 out old container images (using `docker image prune` or similar) to reduce disk used.
 
-Also note that the `max_instances` configuration option is only enforced when running in production on Cloudflare's network. This limit does not apply during local development, so you may run more instances than specified.
 :::
 
 ## Iterating on Container code

src/content/docs/containers/platform-details/environment-variables.mdx

@@ -19,9 +19,11 @@ The container runtime automatically sets the following variables:
 - `CLOUDFLARE_REGION` - a region name
 - `CLOUDFLARE_DURABLE_OBJECT_ID` - the ID of the Durable Object that the container is bound to
 
-## Custom environment variables
+## User-defined environment variables
 
-Custom environment variables can be set when defining a Container in your Worker:
+You can set environment variables when defining a Container in your Worker, or when starting a container instance.
+
+For example:
 
 ```javascript
 class MyContainer extends Container {
@@ -33,6 +35,4 @@ class MyContainer extends Container {
 }
 ```
 
-:::note
-If you supply environment variables with the same names, supplied values will override predefined values.
-:::
+More details about defining environment variables and secrets can be found in [this example](/containers/examples/env-vars-and-secrets).