miscellaneous fixes

Author: emily-shen

public/__redirects

@@ -2421,4 +2421,9 @@
 /ai-gateway/guardrails/* /ai-gateway/features/guardrails/:splat 301
 /ai-gateway/websockets-api/* /ai-gateway/usage/websockets-api/:splat 301
 
-
+# Containers
+/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

@@ -24,7 +24,7 @@ by calling `get()` on their binding with a unique ID.
 We plan to add official support for utilization-based autoscaling and latency-aware load balancing
 in the future.
 
-See the [Autoscaling documentation](/containers/scaling-and-routing) for more information.
+See the [Autoscaling documentation](/containers/platform-details/scaling-and-routing) for more information.
 
 ### Reduction of log noise
 
@@ -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
@@ -71,6 +70,6 @@ There are several areas where we wish to gather feedback from users:
 - Do you want to integrate Containers with any other Cloudflare services? If so, which ones and how?
 - Do you want more ways to interact with a Container via Workers? If so, how?
 - Do you need different mechanisms for routing requests to containers?
-- Do you need different mechanisms for scaling containers? (see [scaling documentation](/containers/scaling-and-routing) for information on autoscaling plans)
+- Do you need different mechanisms for scaling containers? (see [scaling documentation](/containers/platform-details/scaling-and-routing) for information on autoscaling plans)
 
 At any point during the Beta, feel free to [give feedback using this form](https://forms.gle/CscdaEGuw5Hb6H2s7).

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/container-backend.mdx

@@ -1,5 +1,4 @@
 ---
-
 summary: A simple frontend app with a containerized backend
 pcx_content_type: example
 title: Static Frontend, Container Backend
@@ -166,7 +165,7 @@ select of of N instances of a Container to route requests to.
 In the future, we will provide improved latency-aware load balancing and autoscaling.
 
 This will make scaling stateless instances simple and routing more efficient. See the
-[autoscaling documentation](/containers/scaling-and-routing) for more details.
+[autoscaling documentation](/containers/platform-details/scaling-and-routing) for more details.
 :::
 
 ## Define a backend container
@@ -186,11 +185,11 @@ import (
 )
 
 func handler(w http.ResponseWriter, r \*http.Request) {
-    widgets := []map[string]interface{}{
-        {"id": 1, "name": "Widget A"},
-        {"id": 2, "name": "Sprocket B"},
-        {"id": 3, "name": "Gear C"},
-    }
+widgets := []map[string]interface{}{
+{"id": 1, "name": "Widget A"},
+{"id": 2, "name": "Sprocket B"},
+{"id": 3, "name": "Gear C"},
+}
 
     w.Header().Set("Content-Type", "application/json")
     w.Header().Set("Access-Control-Allow-Origin", "*")
@@ -199,9 +198,10 @@ func handler(w http.ResponseWriter, r \*http.Request) {
 }
 
 func main() {
-    http.HandleFunc("/api/widgets", handler)
-    log.Fatal(http.ListenAndServe(":8080", nil))
+http.HandleFunc("/api/widgets", handler)
+log.Fatal(http.ListenAndServe(":8080", nil))
 }
 
 ```
 </Details>
+```

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/examples/stateless.mdx

@@ -1,5 +1,4 @@
 ---
-
 summary: Run multiple instances across Cloudflare's network
 pcx_content_type: example
 title: Stateless Instances
@@ -36,5 +35,5 @@ select of of N instances of a Container to route requests to.
 In the future, we will provide improved latency-aware load balancing and autoscaling.
 
 This will make scaling stateless instances simple and routing more efficient. See the
-[autoscaling documentation](/containers/scaling-and-routing) for more details.
+[autoscaling documentation](/containers/platform-details/scaling-and-routing) for more details.
 :::

src/content/docs/containers/faq.mdx

@@ -68,7 +68,7 @@ See [rollout documentation](/containers/platform-details/rollouts/) for details.
 
 ## How does scaling work?
 
-See [scaling & routing documentation](/containers/scaling-and-routing/) for details.
+See [scaling & routing documentation](/containers/platform-details/scaling-and-routing/) for details.
 
 ## What are cold starts? How fast are they?
 
@@ -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.