containers: config.image override for every container

renderers/docker-compose.ts

@@ -1,5 +1,5 @@
 import { stringify } from "jsr:@std/yaml@^1.0.5";
-import { lookup, makeCtx } from "../utils/resolve.ts";
+import { buildContainerFor, makeCtx } from "../utils/resolve.ts";
 import { portNum, portProtocol } from "../utils/types.ts";
 import type {
   Ctx,
@@ -130,11 +130,7 @@ function addPod(
   volumes: Record<string, unknown>,
   files: RenderResult["files"],
 ) {
-  const builds = pod.containers.map((def) => {
-    const proto = lookup(def.prototype);
-    if (!proto.buildContainer) throw new Error(`container ${def.name} has no buildContainer()`);
-    return { def, built: proto.buildContainer(def, ctx) };
-  });
+  const builds = pod.containers.map((def) => ({ def, built: buildContainerFor(def, ctx) }));
   const leader = builds[0];
 
   const podVols = new Map<string, Volume>();

renderers/k8s.ts

@@ -1,6 +1,6 @@
 import { stringify } from "jsr:@std/yaml@^1.0.5";
 import { imageTag } from "../utils/image-build.ts";
-import { lookup, makeCtx } from "../utils/resolve.ts";
+import { buildContainerFor, makeCtx } from "../utils/resolve.ts";
 import { portInService, portNum, portProtocol } from "../utils/types.ts";
 import type {
   ConfigFile,
@@ -86,11 +86,7 @@ function podDocs(pod: Pod, ctx: Ctx, imageBuilds: Map<string, ImageBuildSpec>):
   };
   const matchLabels = { "app.kubernetes.io/name": pod.name };
 
-  const builds: ContainerBuild[] = pod.containers.map((def) => {
-    const proto = lookup(def.prototype);
-    if (!proto.buildContainer) throw new Error(`container ${def.name} has no buildContainer()`);
-    return { def, built: proto.buildContainer(def, ctx) };
-  });
+  const builds: ContainerBuild[] = pod.containers.map((def) => ({ def, built: buildContainerFor(def, ctx) }));
 
   const volMap = new Map<string, Volume>();
   for (const { built } of builds) {

renderers/podman.ts

@@ -1,5 +1,5 @@
 import { stringify } from "jsr:@std/yaml@^1.0.5";
-import { findComponent, lookup, makeCtx } from "../utils/resolve.ts";
+import { buildContainerFor, findComponent, makeCtx } from "../utils/resolve.ts";
 import { portNum, portProtocol } from "../utils/types.ts";
 import type {
   ConfigFile,
@@ -118,9 +118,7 @@ function podDocs(pod: Pod, recipe: Recipe, ctx: Ctx, imageBuilds: Map<string, Im
   let hasArtifacts = false;
 
   for (const def of pod.containers) {
-    const proto = lookup(def.prototype);
-    if (!proto.buildContainer) throw new Error(`container ${def.name} has no buildContainer()`);
-    const built = proto.buildContainer(def, ctx);
+    const built = buildContainerFor(def, ctx);
     const c = built.container;
     const vols = built.volumes ?? [];
     const volByName = new Map(vols.map((v) => [v.name, v]));

utils/resolve.ts

@@ -1,6 +1,6 @@
 import { isAbsolute, join } from "jsr:@std/path@^1.0.0";
 import { portNum } from "./types.ts";
-import type { ContainerDef, Ctx, HostCtx, Pod, ProcessDef, Prototype, PrototypeOverrides, Recipe } from "./types.ts";
+import type { ContainerDef, ContainerResult, Ctx, HostCtx, Pod, ProcessDef, Prototype, PrototypeOverrides, Recipe } from "./types.ts";
 
 import { DECKER_ROOT } from "./root.ts";
 
@@ -104,3 +104,19 @@ export function makeHostCtx(
 ): HostCtx {
   return { ...makeCtx(recipe, host), artifactsPath, dataPath, configPath, binary };
 }
+
+// Build one container through its prototype, then apply the per-container
+// overrides every prototype supports without special-casing them:
+//   config.image  - replace the prototype's pinned image (a version bump, a
+//                   dev build) from the recipe or an `--opt`, without editing
+//                   the container file. Defaults stay in the prototypes.
+// The renderers all build containers through here, so this is the one place
+// such overrides live.
+export function buildContainerFor(def: ContainerDef, ctx: Ctx): ContainerResult {
+  const proto = lookup(def.prototype);
+  if (!proto.buildContainer) throw new Error(`container ${def.name} has no buildContainer()`);
+  const built = proto.buildContainer(def, ctx);
+  const image = def.config?.image;
+  if (typeof image === "string" && image !== "") built.container.image = image;
+  return built;
+}